Menu
▾
▴
[Opensync-commits] r5286 - in trunk: opensync/capabilities opensync/common opensync/engine opensync/group opensync/ipc opensync/xmlformat tests tests/ipc-tests tests/plugin-tests tools
Author: bricks Date: Tue Mar 10 11:21:54 2009 New Revision: 5286 URL: http://www.opensync.org/changeset/5286 Log: fixed unsigned/signed int errors spotted by -Wsign-compare Modified: trunk/opensync/capabilities/opensync_capabilities.c trunk/opensync/common/opensync_marshal.c trunk/opensync/common/opensync_marshal.h trunk/opensync/common/opensync_marshal_private.h trunk/opensync/common/opensync_memory.c trunk/opensync/common/opensync_memory_internals.h trunk/opensync/engine/opensync_mapping_engine.c trunk/opensync/group/opensync_member.c trunk/opensync/ipc/opensync_message.c trunk/opensync/ipc/opensync_message_internals.h trunk/opensync/ipc/opensync_queue.c trunk/opensync/ipc/opensync_serializer.c trunk/opensync/xmlformat/opensync_xmlfieldlist.c trunk/opensync/xmlformat/opensync_xmlfieldlist.h trunk/opensync/xmlformat/opensync_xmlfieldlist_internals.h trunk/tests/ipc-tests/check_ipc.c trunk/tests/plugin-tests/check_plugin_config.c trunk/tests/support.c trunk/tests/support.h trunk/tools/osyncbinary.c Modified: trunk/opensync/capabilities/opensync_capabilities.c ============================================================================== --- trunk/opensync/capabilities/opensync_capabilities.c Mon Mar 9 11:20:29 2009 (r5285) +++ trunk/opensync/capabilities/opensync_capabilities.c Tue Mar 10 11:21:54 2009 (r5286) @@ -205,7 +205,7 @@ void osync_capabilities_sort(OSyncCapabilities *capabilities) { - int index; + unsigned int index; OSyncCapabilitiesObjType *objtype; OSyncCapability *cur; Modified: trunk/opensync/common/opensync_marshal.c ============================================================================== --- trunk/opensync/common/opensync_marshal.c Mon Mar 9 11:20:29 2009 (r5285) +++ trunk/opensync/common/opensync_marshal.c Tue Mar 10 11:21:54 2009 (r5286) @@ -154,8 +154,7 @@ marshal->buffer_read_pos += sizeof(long long int); } -/* TODO Change char** to const char ** */ -void osync_marshal_read_const_string(OSyncMarshal *marshal, char **value) +void osync_marshal_read_const_string(OSyncMarshal *marshal, const char **value) { int length = 0; osync_marshal_read_int(marshal, &length); Modified: trunk/opensync/common/opensync_marshal.h ============================================================================== --- trunk/opensync/common/opensync_marshal.h Mon Mar 9 11:20:29 2009 (r5285) +++ trunk/opensync/common/opensync_marshal.h Tue Mar 10 11:21:54 2009 (r5286) @@ -196,7 +196,7 @@ * @param marshal The marshal object * @param value Reference to store the string pointer */ -OSYNC_EXPORT void osync_marshal_read_const_string(OSyncMarshal *marshal, char **value); +OSYNC_EXPORT void osync_marshal_read_const_string(OSyncMarshal *marshal, const char **value); /** @brief Read serialized data from marshal buffer. This increments the read * position of the marshal buffer. Caller is responsible for freeing the duplicated Modified: trunk/opensync/common/opensync_marshal_private.h ============================================================================== --- trunk/opensync/common/opensync_marshal_private.h Mon Mar 9 11:20:29 2009 (r5285) +++ trunk/opensync/common/opensync_marshal_private.h Tue Mar 10 11:21:54 2009 (r5286) @@ -41,7 +41,7 @@ /** The pointer to the internal **/ GByteArray *buffer; /** The current read position **/ - int buffer_read_pos; + unsigned int buffer_read_pos; }; /*@}*/ Modified: trunk/opensync/common/opensync_memory.c ============================================================================== --- trunk/opensync/common/opensync_memory.c Mon Mar 9 11:20:29 2009 (r5285) +++ trunk/opensync/common/opensync_memory.c Tue Mar 10 11:21:54 2009 (r5286) @@ -54,11 +54,12 @@ * * MIT HAKMEM Count, Bit counting in constant time and memory. * + * result can't be greater than 32 on 32 Bit systems or 64 on 64 Bit systems * @param u unsigned integer value to count bits * @returns The bit counting result * */ -int osync_bitcount(unsigned int u) +unsigned char osync_bitcount(unsigned int u) { unsigned int uCount = u - ((u >> 1) & 033333333333) - ((u >> 2) & 011111111111); return ((uCount + (uCount >> 3)) & 030707070707) % 63; Modified: trunk/opensync/common/opensync_memory_internals.h ============================================================================== --- trunk/opensync/common/opensync_memory_internals.h Mon Mar 9 11:20:29 2009 (r5285) +++ trunk/opensync/common/opensync_memory_internals.h Tue Mar 10 11:21:54 2009 (r5286) @@ -21,7 +21,7 @@ #ifndef _OPENSYNC_MEMORY_INTERNALS_H #define _OPENSYNC_MEMORY_INTERNALS_H -int osync_bitcount(unsigned int u); +unsigned char osync_bitcount(unsigned int u); #endif /* _OPENSYNC_MEMORY_INTERNALS_H */ Modified: trunk/opensync/engine/opensync_mapping_engine.c ============================================================================== --- trunk/opensync/engine/opensync_mapping_engine.c Mon Mar 9 11:20:29 2009 (r5285) +++ trunk/opensync/engine/opensync_mapping_engine.c Tue Mar 10 11:21:54 2009 (r5286) @@ -425,7 +425,7 @@ osync_bool osync_mapping_engine_check_conflict(OSyncMappingEngine *engine) { - int is_same = 0; + unsigned int is_same = 0; OSyncList *e = NULL; osync_trace(TRACE_ENTRY, "%s(%p)", __func__, engine); osync_assert(engine != NULL); Modified: trunk/opensync/group/opensync_member.c ============================================================================== --- trunk/opensync/group/opensync_member.c Mon Mar 9 11:20:29 2009 (r5285) +++ trunk/opensync/group/opensync_member.c Tue Mar 10 11:21:54 2009 (r5286) @@ -475,7 +475,7 @@ static osync_bool _osync_member_save_sink(xmlDoc *doc, OSyncObjTypeSink *sink, OSyncError **error) { - int i = 0; + unsigned int i = 0; xmlNode *node = NULL; /* Write main sink stuff in main node. */ Modified: trunk/opensync/ipc/opensync_message.c ============================================================================== --- trunk/opensync/ipc/opensync_message.c Mon Mar 9 11:20:29 2009 (r5285) +++ trunk/opensync/ipc/opensync_message.c Tue Mar 10 11:21:54 2009 (r5286) @@ -251,7 +251,7 @@ } /* TODO Change char** to const char ** */ -void osync_message_read_const_string(OSyncMessage *message, char **value) +void osync_message_read_const_string(OSyncMessage *message, const char **value) { osync_marshal_read_const_string(message->marshal, value); } Modified: trunk/opensync/ipc/opensync_message_internals.h ============================================================================== --- trunk/opensync/ipc/opensync_message_internals.h Mon Mar 9 11:20:29 2009 (r5285) +++ trunk/opensync/ipc/opensync_message_internals.h Tue Mar 10 11:21:54 2009 (r5286) @@ -378,7 +378,7 @@ * @param message The message * @param value Reference to store the string pointer */ -OSYNC_TEST_EXPORT void osync_message_read_const_string(OSyncMessage *message, char **value); +OSYNC_TEST_EXPORT void osync_message_read_const_string(OSyncMessage *message, const char **value); /** @brief Read serialized data from message buffer. This increments the read * position of the message buffer. Caller is responsible for freeing the duplicated Modified: trunk/opensync/ipc/opensync_queue.c ============================================================================== --- trunk/opensync/ipc/opensync_queue.c Mon Mar 9 11:20:29 2009 (r5285) +++ trunk/opensync/ipc/opensync_queue.c Tue Mar 10 11:21:54 2009 (r5286) @@ -524,7 +524,7 @@ osync_message_get_buffer(message, &data, &length); if (length) { - int sent = 0; + unsigned int sent = 0; do { int written = _osync_queue_write_data(queue, data + sent, length - sent, &error); if (written < 0) @@ -718,7 +718,7 @@ * have the correct size for the read */ osync_message_get_buffer(message, &buffer, NULL); if (size) { - unsigned int read = 0; + int read = 0; do { int inc = _osync_queue_read_data(queue, buffer + read, size - read, &error); Modified: trunk/opensync/ipc/opensync_serializer.c ============================================================================== --- trunk/opensync/ipc/opensync_serializer.c Mon Mar 9 11:20:29 2009 (r5285) +++ trunk/opensync/ipc/opensync_serializer.c Tue Mar 10 11:21:54 2009 (r5286) @@ -278,7 +278,7 @@ osync_bool osync_marshal_objtype_sink(OSyncMessage *message, OSyncObjTypeSink *sink, OSyncError **error) { int i = 0; - unsigned int num = 0; + int num = 0; osync_assert(message); osync_assert(sink); Modified: trunk/opensync/xmlformat/opensync_xmlfieldlist.c ============================================================================== --- trunk/opensync/xmlformat/opensync_xmlfieldlist.c Mon Mar 9 11:20:29 2009 (r5285) +++ trunk/opensync/xmlformat/opensync_xmlfieldlist.c Tue Mar 10 11:21:54 2009 (r5286) @@ -52,7 +52,7 @@ g_ptr_array_add(xmlfieldlist->array, xmlfield); } -void osync_xmlfieldlist_remove(OSyncXMLFieldList *xmlfieldlist, int index) +void osync_xmlfieldlist_remove(OSyncXMLFieldList *xmlfieldlist, unsigned int index) { osync_assert(xmlfieldlist); @@ -68,14 +68,14 @@ g_free(xmlfieldlist); } -int osync_xmlfieldlist_get_length(OSyncXMLFieldList *xmlfieldlist) +unsigned int osync_xmlfieldlist_get_length(OSyncXMLFieldList *xmlfieldlist) { osync_assert(xmlfieldlist); return xmlfieldlist->array->len; } -OSyncXMLField *osync_xmlfieldlist_item(OSyncXMLFieldList *xmlfieldlist, int index) +OSyncXMLField *osync_xmlfieldlist_item(OSyncXMLFieldList *xmlfieldlist, unsigned int index) { osync_assert(xmlfieldlist); Modified: trunk/opensync/xmlformat/opensync_xmlfieldlist.h ============================================================================== --- trunk/opensync/xmlformat/opensync_xmlfieldlist.h Mon Mar 9 11:20:29 2009 (r5285) +++ trunk/opensync/xmlformat/opensync_xmlfieldlist.h Tue Mar 10 11:21:54 2009 (r5286) @@ -42,7 +42,7 @@ * @param xmlfieldlist Pointer to the xmlfieldlist object * @return The number of xmlfield items in the xmlfieldlist */ -OSYNC_EXPORT int osync_xmlfieldlist_get_length(OSyncXMLFieldList *xmlfieldlist); +OSYNC_EXPORT unsigned int osync_xmlfieldlist_get_length(OSyncXMLFieldList *xmlfieldlist); /** * @brief Get the xmlfield at the given index of an xmlfieldlist @@ -50,7 +50,7 @@ * @param index The index of the xmlfield pointer to return * @return The item at the specified index, or NULL in case of error. */ -OSYNC_EXPORT OSyncXMLField *osync_xmlfieldlist_item(OSyncXMLFieldList *xmlfieldlist, int index); +OSYNC_EXPORT OSyncXMLField *osync_xmlfieldlist_item(OSyncXMLFieldList *xmlfieldlist, unsigned int index); /*@}*/ Modified: trunk/opensync/xmlformat/opensync_xmlfieldlist_internals.h ============================================================================== --- trunk/opensync/xmlformat/opensync_xmlfieldlist_internals.h Mon Mar 9 11:20:29 2009 (r5285) +++ trunk/opensync/xmlformat/opensync_xmlfieldlist_internals.h Tue Mar 10 11:21:54 2009 (r5286) @@ -50,7 +50,7 @@ * @param xmlfieldlist The pointer to a xmlfieldlist object * @param index The index of the xmlfield pointer to remove */ -void osync_xmlfieldlist_remove(OSyncXMLFieldList *xmlfieldlist, int index); +void osync_xmlfieldlist_remove(OSyncXMLFieldList *xmlfieldlist, unsigned int index); /*@}*/ Modified: trunk/tests/ipc-tests/check_ipc.c ============================================================================== --- trunk/tests/ipc-tests/check_ipc.c Mon Mar 9 11:20:29 2009 (r5285) +++ trunk/tests/ipc-tests/check_ipc.c Tue Mar 10 11:21:54 2009 (r5286) @@ -152,7 +152,7 @@ int int1; long long int longint1; - char *string; + const char *string; void *databuf; osync_message_read_int(message, &int1); @@ -1032,7 +1032,7 @@ int int1; long long int longint1; - char *string; + const char *string; void *databuf; osync_message_read_int(message, &int1); @@ -1218,7 +1218,7 @@ int int1; long long int longint1; - char *string; + const char *string; void *databuf; osync_message_read_int(message, &int1); @@ -1395,7 +1395,7 @@ int int1; long long int longint1; - char *string; + const char *string; void *databuf; osync_message_read_int(message, &int1); @@ -1583,7 +1583,7 @@ int int1; long long int longint1; - char *string; + const char *string; void *databuf; @@ -1775,7 +1775,7 @@ int int1; long long int longint1; - char *string; + const char *string; void *databuf; osync_message_read_int(message, &int1); Modified: trunk/tests/plugin-tests/check_plugin_config.c ============================================================================== --- trunk/tests/plugin-tests/check_plugin_config.c Mon Mar 9 11:20:29 2009 (r5285) +++ trunk/tests/plugin-tests/check_plugin_config.c Tue Mar 10 11:21:54 2009 (r5286) @@ -880,7 +880,7 @@ fail_unless(!strcmp(osync_plugin_authentication_get_reference(reloaded_auth), "ref"), NULL); OSyncList *r, *p, *v; - int i, j, k; + unsigned int i, j, k; for (i = 1, r = reloaded_resources; r; r = r->next, i++) { char *value = g_strdup_printf("foobar%i", i); fail_unless(!strcmp(osync_plugin_resource_get_name(r->data), value), NULL); Modified: trunk/tests/support.c ============================================================================== --- trunk/tests/support.c Mon Mar 9 11:20:29 2009 (r5285) +++ trunk/tests/support.c Tue Mar 10 11:21:54 2009 (r5286) @@ -18,7 +18,7 @@ unsigned int osync_testsuite_selected(Suite *s, int argc, char **argv, struct osync_testcase_s *tc) { - unsigned int i, j, n=0; + int i, j, n=0; /* Also argv[0]! for symlink-ed calls */ for (i=0; argc > i; i++) { for (j=0; tc[j].name; j++) { @@ -268,7 +268,7 @@ osync_trace(TRACE_EXIT, "%s", __func__); } -OSyncHashTable *hashtable_load(const char *path, const char *objtype, int entries) +OSyncHashTable *hashtable_load(const char *path, const char *objtype, unsigned int entries) { OSyncError *error = NULL; OSyncHashTable *table = osync_hashtable_new(path, objtype, &error); Modified: trunk/tests/support.h ============================================================================== --- trunk/tests/support.h Mon Mar 9 11:20:29 2009 (r5285) +++ trunk/tests/support.h Tue Mar 10 11:21:54 2009 (r5286) @@ -95,7 +95,7 @@ OSyncMappingTable *mappingtable_load(const char *path, const char *objtype, int num_mappings); void mappingtable_close(OSyncMappingTable *maptable); -OSyncHashTable *hashtable_load(const char *path, const char *objtype, int entries); +OSyncHashTable *hashtable_load(const char *path, const char *objtype, unsigned int entries); void check_hash(OSyncHashTable *table, const char *cmpuid); void check_mapping(OSyncMappingTable *table, int memberid, int mappingid, int numentries, const char *uid); Modified: trunk/tools/osyncbinary.c ============================================================================== --- trunk/tools/osyncbinary.c Mon Mar 9 11:20:29 2009 (r5285) +++ trunk/tools/osyncbinary.c Tue Mar 10 11:21:54 2009 (r5286) @@ -18,7 +18,7 @@ osync_bool convert_hex(const char *input, unsigned int inpsize, char **output, unsigned int *outsize) { - int i = 0; + unsigned int i = 0; GString *string = g_string_new(""); unsigned int character = 0; for (i = 0; i < inpsize - 1; i = i + 2) { @@ -40,7 +40,7 @@ osync_bool convert_bin(const char *input, unsigned int inpsize, char **output, unsigned int *outsize) { - int i = 0; + unsigned int i = 0; GString *string = g_string_new(""); for (i = 0; i < inpsize; i++) { |
