Bug fixes + tabbing

[iotcloud.git] / version2 / src / C / ByteBuffer.cc

diff --git a/version2/src/C/ByteBuffer.cc b/version2/src/C/ByteBuffer.cc
index e1f6d4b83f40b4af1c80ce59956c3a62acc2ed9b..22e28cd1a543f3c9ac86283502e05e0da350c061 100644 (file)
--- a/version2/src/C/ByteBuffer.cc
+++ b/version2/src/C/ByteBuffer.cc
@@ -7,7 +7,7 @@ ByteBuffer::ByteBuffer(Array<char> *array) :
 }
 
 void ByteBuffer::put(char c) {
-       buffer->set(offset++ , c);
+       buffer->set(offset++, c);
 }
 
 void ByteBuffer::putInt(int32_t l) {
@@ -30,29 +30,29 @@ void ByteBuffer::putLong(int64_t l) {
 
 void ByteBuffer::put(Array<char> *array) {
        memcpy(&buffer->internalArray()[offset], array->internalArray(), array->length());
-       offset+=array->length();
+       offset += array->length();
 }
 
 int64_t ByteBuffer::getLong() {
-       char * array = &buffer->internalArray()[offset];
-       offset+=8;
-       return (((int64_t)array[0]) << 56) |
-               (((int64_t)array[1]) << 48) |
-               (((int64_t)array[2]) << 40) |
-               (((int64_t)array[3]) << 32) |
-               (((int64_t)array[4]) << 24) |
-               (((int64_t)array[5]) << 16) |
-               (((int64_t)array[6]) << 8) |
-               (((int64_t)array[7]));
+       char *array = &buffer->internalArray()[offset];
+       offset += 8;
+       return (((int64_t)(unsigned char)array[0]) << 56) |
+                                (((int64_t)(unsigned char)array[1]) << 48) |
+                                (((int64_t)(unsigned char)array[2]) << 40) |
+                                (((int64_t)(unsigned char)array[3]) << 32) |
+                                (((int64_t)(unsigned char)array[4]) << 24) |
+                                (((int64_t)(unsigned char)array[5]) << 16) |
+                                (((int64_t)(unsigned char)array[6]) << 8) |
+                                (((int64_t)(unsigned char)array[7]));
 }
 
 int32_t ByteBuffer::getInt() {
-       char * array = &buffer->internalArray()[offset];
-       offset+=4;
-       return (((int32_t)array[0]) << 24) |
-               (((int32_t)array[1]) << 16) |
-               (((int32_t)array[2]) << 8) |
-               (((int32_t)array[3]));
+       char *array = &buffer->internalArray()[offset];
+       offset += 4;
+       return (((int32_t)(unsigned char)array[0]) << 24) |
+                                (((int32_t)(unsigned char)array[1]) << 16) |
+                                (((int32_t)(unsigned char)array[2]) << 8) |
+                                (((int32_t)(unsigned char)array[3]));
 }
 
 char ByteBuffer::get() {