projects
/
iotcloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug fixes + tabbing
[iotcloud.git]
/
version2
/
src
/
C
/
IoTString.h
diff --git
a/version2/src/C/IoTString.h
b/version2/src/C/IoTString.h
index cb2d68b1af6dd13ddebf8ebcf2f95faef0bca912..1fb527f03a9977233377a1796c0c2c47e656993c 100644
(file)
--- a/
version2/src/C/IoTString.h
+++ b/
version2/src/C/IoTString.h
@@
-9,9
+9,9
@@
* @version 1.0
*/
* @version 1.0
*/
-inline int hashCharArray(Array<char> *array) {
+inline
unsigned
int hashCharArray(Array<char> *array) {
uint len = array->length();
uint len = array->length();
- int hash = 0;
+
unsigned
int hash = 0;
for (uint i = 0; i < len; i++) {
hash = 31 * hash + array->get(i);
}
for (uint i = 0; i < len; i++) {
hash = 31 * hash + array->get(i);
}
@@
-22,7
+22,7
@@
class IoTString {
private:
Array<char> *array;
IoTString() {}
private:
Array<char> *array;
IoTString() {}
- int hashvalue;
+
unsigned
int hashvalue;
/**
* Builds an IoTString object around the char array. This
* constructor makes a copy, so the caller is free to modify the char array.
/**
* Builds an IoTString object around the char array. This
* constructor makes a copy, so the caller is free to modify the char array.
@@
-37,7
+37,7
@@
public:
IoTString(const char *_array) {
int32_t len = strlen(_array);
array = new Array<char>(len);
IoTString(const char *_array) {
int32_t len = strlen(_array);
array = new Array<char>(len);
-
strcpy(array->internalArray(), _array
);
+
memcpy(array->internalArray(), _array, len
);
hashvalue = hashCharArray(array);
}
hashvalue = hashCharArray(array);
}
@@
-51,7
+51,7
@@
public:
}
char get(uint i) {return array->get(i);}
}
char get(uint i) {return array->get(i);}
-
+
/**
* Internal method to grab a reference to our char array. Caller
* must not modify it.
/**
* Internal method to grab a reference to our char array. Caller
* must not modify it.
@@
-79,7
+79,7
@@
public:
return result == 0;
}
return result == 0;
}
- int hashValue() { return hashvalue;}
+
unsigned
int hashValue() { return hashvalue;}
int length() { return array->length(); }
friend IoTString *IoTString_shallow(Array<char> *_array);
};
int length() { return array->length(); }
friend IoTString *IoTString_shallow(Array<char> *_array);
};
@@
-90,7
+90,7
@@
inline IoTString *IoTString_shallow(Array<char> *_array) {
return str;
}
return str;
}
-inline int hashString(IoTString *a) {
+inline
unsigned
int hashString(IoTString *a) {
return a->hashValue();
}
return a->hashValue();
}