Menu
▾
▴
[Opensync-commits] r6051 - in trunk: opensync opensync/archive opensync/client opensync/engine opensync/group opensync/ipc opensync/mapping opensync/plugin tests/archive-tests tests/mock-plugin wrapper
Author: cdfrey Date: Mon Jul 5 20:51:38 2010 New Revision: 6051 URL: http://www.opensync.org/changeset/6051 Log: Removed all unnecessary long longs from IDs, and gave IDs typedef names The new ID types are: typedef int osync_memberid; typedef int osync_mappingid; typedef int osync_groupid; typedef long long int osync_archiveid; typedef long long int osync_messageid; osync_archiveid is 64 bits because the ID is the row ID of the underlying database. This must match the database used. Note that there is a bug in the implementation where the above 64 bit IDs are crammed into a 32 bit pointer on 32 bit systems. The implementation should be fixed, not the size of the osync_archiveid. Look for FIXME's in the code. osync_messageid is 64 bits because 6 bytes are used for the time in seconds and microseconds, and the lower 2 bytes are a random number, to create a unique IPC message ID. The other 3 IDs usually start at 1 or 0 and increment from there, and int should be completely sufficient for them. Modified: trunk/opensync/archive/opensync_archive.c trunk/opensync/archive/opensync_archive_internals.h trunk/opensync/client/opensync_client.c trunk/opensync/client/opensync_client_proxy.c trunk/opensync/engine/opensync_engine.c trunk/opensync/engine/opensync_engine_private.h trunk/opensync/engine/opensync_mapping_engine.c trunk/opensync/engine/opensync_mapping_engine.h trunk/opensync/engine/opensync_mapping_entry_engine.c trunk/opensync/engine/opensync_obj_engine.c trunk/opensync/engine/opensync_sink_engine.c trunk/opensync/group/opensync_group.c trunk/opensync/group/opensync_group.h trunk/opensync/group/opensync_group_env.c trunk/opensync/group/opensync_group_env_private.h trunk/opensync/group/opensync_group_internals.h trunk/opensync/group/opensync_group_private.h trunk/opensync/group/opensync_member.c trunk/opensync/group/opensync_member.h trunk/opensync/group/opensync_member_internals.h trunk/opensync/ipc/opensync_message.c trunk/opensync/ipc/opensync_message_internals.h trunk/opensync/ipc/opensync_message_private.h trunk/opensync/ipc/opensync_queue.c trunk/opensync/ipc/opensync_queue_private.h trunk/opensync/mapping/opensync_mapping.c trunk/opensync/mapping/opensync_mapping.h trunk/opensync/mapping/opensync_mapping_entry.c trunk/opensync/mapping/opensync_mapping_entry.h trunk/opensync/mapping/opensync_mapping_entry_internals.h trunk/opensync/mapping/opensync_mapping_internals.h trunk/opensync/mapping/opensync_mapping_table.c trunk/opensync/mapping/opensync_mapping_table.h trunk/opensync/opensync.h trunk/opensync/plugin/opensync_plugin_info_private.h trunk/tests/archive-tests/check_archive.c trunk/tests/mock-plugin/mock_sync.c trunk/wrapper/opensync-group.i Modified: trunk/opensync/archive/opensync_archive.c ============================================================================== --- trunk/opensync/archive/opensync_archive.c Thu Jul 1 05:47:31 2010 (r6050) +++ trunk/opensync/archive/opensync_archive.c Mon Jul 5 20:51:38 2010 (r6051) @@ -204,12 +204,12 @@ } } -osync_bool osync_archive_save_data(OSyncArchive *archive, long long int id, const char *objtype, const char *data, unsigned int size, OSyncError **error) +osync_bool osync_archive_save_data(OSyncArchive *archive, osync_mappingid id, const char *objtype, const char *data, unsigned int size, OSyncError **error) { char *query = NULL; char *escaped_objtype = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %lli, %s, %p, %u, %p)", __func__, archive, id, objtype, data, size, error); + osync_trace(TRACE_ENTRY, "%s(%p, %i, %s, %p, %u, %p)", __func__, archive, id, objtype, data, size, error); osync_assert(archive); osync_assert(data); osync_assert(size); @@ -219,7 +219,7 @@ // FIXME: Avoid subselect - this query needs up to 0.5s escaped_objtype = osync_db_sql_escape(objtype); - query = osync_strdup_printf("REPLACE INTO tbl_archive (objtype, mappingid, data) VALUES('%s', %lli, ?)", escaped_objtype, id); + query = osync_strdup_printf("REPLACE INTO tbl_archive (objtype, mappingid, data) VALUES('%s', %i, ?)", escaped_objtype, id); osync_free(escaped_objtype); escaped_objtype = NULL; @@ -281,14 +281,14 @@ return -1; } -long long int osync_archive_save_change(OSyncArchive *archive, long long int id, const char *uid, const char *objtype, long long int mappingid, long long int memberid, const char *objengine, OSyncError **error) +osync_archiveid osync_archive_save_change(OSyncArchive *archive, osync_archiveid id, const char *uid, const char *objtype, osync_mappingid mappingid, osync_memberid memberid, const char *objengine, OSyncError **error) { char *query = NULL; char *escaped_uid = NULL; char *escaped_objtype = NULL; char *escaped_objengine = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %lli, %s, %s, %lli, %lli, %p, %p)", __func__, archive, id, uid, objtype, mappingid, memberid, __NULLSTR(objengine), error); + osync_trace(TRACE_ENTRY, "%s(%p, %lli, %s, %s, %i, %i, %p, %p)", __func__, archive, id, uid, objtype, mappingid, memberid, __NULLSTR(objengine), error); osync_assert(archive); osync_assert(uid); osync_assert(objtype); @@ -302,9 +302,9 @@ escaped_objengine = osync_db_sql_escape(objengine); if (!id) { - query = osync_strdup_printf("INSERT INTO tbl_changes (objtype, uid, mappingid, memberid, objengine) VALUES('%s', '%s', '%lli', '%lli', '%s')", escaped_objtype, escaped_uid, mappingid, memberid, objengine); + query = osync_strdup_printf("INSERT INTO tbl_changes (objtype, uid, mappingid, memberid, objengine) VALUES('%s', '%s', '%i', '%i', '%s')", escaped_objtype, escaped_uid, mappingid, memberid, objengine); } else { - query = osync_strdup_printf("UPDATE tbl_changes SET uid='%s', mappingid='%lli', memberid='%lli', objengine='%s' WHERE objtype='%s' AND id=%lli", escaped_uid, mappingid, memberid, escaped_objengine, escaped_objtype, id); + query = osync_strdup_printf("UPDATE tbl_changes SET uid='%s', mappingid='%i', memberid='%i', objengine='%s' WHERE objtype='%s' AND id=%lli", escaped_uid, mappingid, memberid, escaped_objengine, escaped_objtype, id); } osync_free(escaped_objengine); osync_free(escaped_objtype); @@ -331,7 +331,7 @@ return 0; } -osync_bool osync_archive_delete_change(OSyncArchive *archive, long long int id, const char *objtype, OSyncError **error) +osync_bool osync_archive_delete_change(OSyncArchive *archive, osync_archiveid id, const char *objtype, OSyncError **error) { char *query = NULL; char *escaped_objtype = NULL; @@ -366,7 +366,9 @@ char *query = NULL; char *escaped_objtype = NULL; OSyncList *result = NULL, *row = NULL, *column = NULL; - long long int id = 0, mappingid = 0, memberid = 0; + osync_archiveid id = 0; + osync_mappingid mappingid = 0; + osync_memberid memberid = 0; const char *uid = NULL; const char *value_str = NULL; @@ -420,21 +422,23 @@ osync_error_set(error, OSYNC_ERROR_GENERIC, "Database table tbl_changes corrupt, mappingid is NULL"); goto error; } - mappingid = g_ascii_strtoull(value_str, NULL, 0); + mappingid = strtoul(value_str, NULL, 0); value_str = osync_list_nth_data(column, 3); if (!value_str) { osync_error_set(error, OSYNC_ERROR_GENERIC, "Database table tbl_changes corrupt, memberid is NULL"); goto error; } - memberid = g_ascii_strtoull(value_str, NULL, 0); + memberid = strtoul(value_str, NULL, 0); + // FIXME - this (int) cast throws away part of the id's 64 bits + // and these 64 bits are governed by the DB layer's row ID *ids = osync_list_append((*ids), GINT_TO_POINTER((int)id)); *uids = osync_list_append((*uids), osync_strdup(uid)); - *mappingids = osync_list_append((*mappingids), GINT_TO_POINTER((int)mappingid)); - *memberids = osync_list_append((*memberids), GINT_TO_POINTER((int)memberid)); + *mappingids = osync_list_append((*mappingids), GINT_TO_POINTER(mappingid)); + *memberids = osync_list_append((*memberids), GINT_TO_POINTER(memberid)); - osync_trace(TRACE_INTERNAL, "Loaded change with uid %s, mappingid %lli from member %lli", uid, mappingid, memberid); + osync_trace(TRACE_INTERNAL, "Loaded change with uid %s, mappingid %i from member %i", uid, mappingid, memberid); } osync_db_free_list(result); @@ -483,7 +487,8 @@ OSyncList *result = NULL, *row = NULL, *column = NULL; char *query = NULL; char *escaped_objtype = NULL; - long long int mappingid = 0, memberid = 0; + osync_mappingid mappingid = 0; + osync_memberid memberid = 0; int changetype = 0; osync_trace(TRACE_ENTRY, "%s(%p, %s, %p, %p)", __func__, archive, objtype, mappingids, error); @@ -516,11 +521,11 @@ mappingid = atoi(osync_list_nth_data(column, 1)); changetype = atoi(osync_list_nth_data(column, 2)); - *memberids = osync_list_append((*memberids), GINT_TO_POINTER((int)memberid)); - *mappingids = osync_list_append((*mappingids), GINT_TO_POINTER((int)mappingid)); - *changetypes = osync_list_append((*changetypes), GINT_TO_POINTER((int)changetype)); + *memberids = osync_list_append((*memberids), GINT_TO_POINTER(memberid)); + *mappingids = osync_list_append((*mappingids), GINT_TO_POINTER(mappingid)); + *changetypes = osync_list_append((*changetypes), GINT_TO_POINTER(changetype)); - osync_trace(TRACE_INTERNAL, "Loaded ignored mapping with mappingid %lli", mappingid); + osync_trace(TRACE_INTERNAL, "Loaded ignored mapping with mappingid %i", mappingid); } osync_db_free_list(result); @@ -532,11 +537,11 @@ return FALSE; } -osync_bool osync_archive_save_ignored_conflict(OSyncArchive *archive, const char *objtype, long long int memberid, long long int mappingid, OSyncChangeType changetype, OSyncError **error) +osync_bool osync_archive_save_ignored_conflict(OSyncArchive *archive, const char *objtype, osync_memberid memberid, osync_mappingid mappingid, OSyncChangeType changetype, OSyncError **error) { char *query = NULL; char *escaped_objtype = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %s, %lli, %lli, %p)", __func__, archive, objtype, memberid, mappingid, error); + osync_trace(TRACE_ENTRY, "%s(%p, %s, %i, %i, %p)", __func__, archive, objtype, memberid, mappingid, error); osync_assert(archive); osync_assert(objtype); @@ -545,7 +550,7 @@ goto error; escaped_objtype = osync_db_sql_escape(objtype); - query = osync_strdup_printf("INSERT INTO tbl_changelog (objtype, memberid, mappingid, changetype) VALUES('%s', '%lli', '%lli', '%i')", escaped_objtype, memberid, mappingid, changetype); + query = osync_strdup_printf("INSERT INTO tbl_changelog (objtype, memberid, mappingid, changetype) VALUES('%s', '%i', '%i', '%i')", escaped_objtype, memberid, mappingid, changetype); osync_free(escaped_objtype); escaped_objtype = NULL; @@ -556,7 +561,7 @@ osync_free(query); - osync_trace(TRACE_EXIT, "%s: %lli", __func__, mappingid); + osync_trace(TRACE_EXIT, "%s: %i", __func__, mappingid); return TRUE; error: Modified: trunk/opensync/archive/opensync_archive_internals.h ============================================================================== --- trunk/opensync/archive/opensync_archive_internals.h Thu Jul 1 05:47:31 2010 (r6050) +++ trunk/opensync/archive/opensync_archive_internals.h Mon Jul 5 20:51:38 2010 (r6051) @@ -80,7 +80,7 @@ * @param error Pointer to an error struct * @return Returns TRUE on success otherwise FALSE */ -OSYNC_TEST_EXPORT osync_bool osync_archive_save_data(OSyncArchive *archive, long long int id, const char *objtype, const char *data, unsigned int size, OSyncError **error); +OSYNC_TEST_EXPORT osync_bool osync_archive_save_data(OSyncArchive *archive, osync_mappingid id, const char *objtype, const char *data, unsigned int size, OSyncError **error); /** * @brief Loads data of an entry which is stored in the group archive database (blob). @@ -108,7 +108,7 @@ * @param error Pointer to an error struct * @return Returns number of entries in archive group database. 0 on error. */ -OSYNC_TEST_EXPORT long long int osync_archive_save_change(OSyncArchive *archive, long long int id, const char *uid, const char *objtype, long long int mappingid, long long int memberid, const char *objengine, OSyncError **error); +OSYNC_TEST_EXPORT osync_archiveid osync_archive_save_change(OSyncArchive *archive, osync_archiveid id, const char *uid, const char *objtype, osync_mappingid mappingid, osync_memberid memberid, const char *objengine, OSyncError **error); /** * @brief Deletes an entry from a group archive. @@ -119,7 +119,7 @@ * @param error Pointer to an error struct * @return TRUE if the specified change was deleted successfully, otherwise FALSE */ -osync_bool osync_archive_delete_change(OSyncArchive *archive, long long int id, const char *objtype, OSyncError **error); +osync_bool osync_archive_delete_change(OSyncArchive *archive, osync_archiveid id, const char *objtype, OSyncError **error); /** * @brief Delete all changes from group archive for a certain object type. @@ -155,7 +155,7 @@ * @param error Pointer to an error struct * @return Returns TRUE on success, FALSE otherwise */ -osync_bool osync_archive_save_ignored_conflict(OSyncArchive *archive, const char *objtype, long long int memberid, long long int mappingid, OSyncChangeType changetype, OSyncError **error); +osync_bool osync_archive_save_ignored_conflict(OSyncArchive *archive, const char *objtype, osync_memberid memberid, osync_mappingid mappingid, OSyncChangeType changetype, OSyncError **error); /** * @brief Deletes all ignored conflict entries of the changelog with the objtype. Modified: trunk/opensync/client/opensync_client.c ============================================================================== --- trunk/opensync/client/opensync_client.c Thu Jul 1 05:47:31 2010 (r6050) +++ trunk/opensync/client/opensync_client.c Mon Jul 5 20:51:38 2010 (r6051) @@ -783,8 +783,8 @@ #ifdef OPENSYNC_UNITTESTS { - long long int memberid; - if (!osync_message_read_long_long_int(message, &memberid, error)) // Introduced (only) for testing/debugging purpose (mock-sync) + osync_memberid memberid; + if (!osync_message_read_int(message, &memberid, error)) // Introduced (only) for testing/debugging purpose (mock-sync) goto error; client->plugin_info->memberid = memberid; Modified: trunk/opensync/client/opensync_client_proxy.c ============================================================================== --- trunk/opensync/client/opensync_client_proxy.c Thu Jul 1 05:47:31 2010 (r6050) +++ trunk/opensync/client/opensync_client_proxy.c Mon Jul 5 20:51:38 2010 (r6051) @@ -1068,7 +1068,7 @@ osync_queue_disconnect(read2, error); osync_trace(TRACE_INTERNAL, "About to exec osplugin"); - //char *memberstring = g_strdup_printf("%lli", osync_member_get_id(proxy->member)); + //char *memberstring = g_strdup_printf("%i", osync_member_get_id(proxy->member)); //execlp("osplugin", "osplugin", osync_group_get_configdir(osync_member_get_group(osync_proxy_get_member(proxy)), memberstring, NULL); readfd = osync_strdup_printf("%i", osync_queue_get_fd(read1)); writefd = osync_strdup_printf("%i", osync_queue_get_fd(write2)); @@ -1281,7 +1281,7 @@ int haspluginconfig = config ? TRUE : FALSE; OSyncMessage *message = NULL; #ifdef OPENSYNC_UNITTESTS - long long int memberid = 0; + osync_memberid memberid = 0; #endif osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %s, %s, %s, %s, %s, %p, %p)", __func__, proxy, callback, userdata, __NULLSTR(formatdir), __NULLSTR(plugindir), __NULLSTR(plugin), __NULLSTR(groupname), __NULLSTR(configdir), config, error); @@ -1343,7 +1343,7 @@ if (proxy->member) memberid = osync_member_get_id(proxy->member); - osync_message_write_long_long_int(message, memberid, error); + osync_message_write_int(message, memberid, error); #endif osync_message_set_handler(message, _osync_client_proxy_init_handler, ctx); Modified: trunk/opensync/engine/opensync_engine.c ============================================================================== --- trunk/opensync/engine/opensync_engine.c Thu Jul 1 05:47:31 2010 (r6050) +++ trunk/opensync/engine/opensync_engine.c Mon Jul 5 20:51:38 2010 (r6051) @@ -195,7 +195,7 @@ OSyncError *error = NULL; osync_bool found = FALSE; OSyncMember *member = NULL; - long long int memberid = 0; + osync_memberid memberid = 0; const char *uid = NULL; OSyncChangeType changetype = 0; const char *format = NULL; @@ -217,7 +217,7 @@ objtype_sink = osync_member_find_objtype_sink(member, objtype); - osync_trace(TRACE_INTERNAL, "Received change %s, changetype %i, format %s, objtype %s from member %lli", uid, changetype, format, objtype, memberid); + osync_trace(TRACE_INTERNAL, "Received change %s, changetype %i, format %s, objtype %s from member %i", uid, changetype, format, objtype, memberid); data = osync_change_get_data(change); @@ -233,7 +233,7 @@ objtype = osync_objformat_get_objtype(detected_format); } - member_objtype = osync_strdup_printf("%lli_%s", memberid, objtype); + member_objtype = osync_strdup_printf("%i_%s", memberid, objtype); /* Convert the format to the internal format */ internalFormat = _osync_engine_get_internal_format(engine, objtype); @@ -1127,7 +1127,7 @@ { OSyncList *o; unsigned int added, modified, deleted, unmodified, unknown, total, n; - long long int memberid; + osync_memberid memberid; if (!osync_trace_is_enabled()) return; @@ -1176,7 +1176,7 @@ } } - osync_trace(TRACE_INTERNAL, "\tMember: %lli " + osync_trace(TRACE_INTERNAL, "\tMember: %i " "added:%u modified:%u deleted:%u " "(unmodified:%u unknown:%u)", memberid, added, modified, deleted, unmodified, unknown); Modified: trunk/opensync/engine/opensync_engine_private.h ============================================================================== --- trunk/opensync/engine/opensync_engine_private.h Thu Jul 1 05:47:31 2010 (r6050) +++ trunk/opensync/engine/opensync_engine_private.h Mon Jul 5 20:51:38 2010 (r6051) @@ -176,7 +176,7 @@ /** The type of the status update */ OSyncEngineMappingEvent type; /** If the mapping was already solved, this will have the id if the winning entry */ - long long int winner; + osync_memberid winner; /** The mapping for which the status update is */ OSyncMapping *mapping; /** If the status was a error, this error will be set */ Modified: trunk/opensync/engine/opensync_mapping_engine.c ============================================================================== --- trunk/opensync/engine/opensync_mapping_engine.c Thu Jul 1 05:47:31 2010 (r6050) +++ trunk/opensync/engine/opensync_mapping_engine.c Mon Jul 5 20:51:38 2010 (r6051) @@ -284,7 +284,7 @@ osync_assert(engine); osync_assert(engine->mapping); - osync_trace(TRACE_ENTRY, "%s(%p(%lli), %p)", __func__, engine, osync_mapping_get_id(engine->mapping), error); + osync_trace(TRACE_ENTRY, "%s(%p(%i), %p)", __func__, engine, osync_mapping_get_id(engine->mapping), error); if (engine->synced) { osync_trace(TRACE_EXIT, "%s: No need to multiply. Already synced", __func__); @@ -578,7 +578,7 @@ return NULL; } -OSyncChange *osync_mapping_engine_member_change(OSyncMappingEngine *engine, long long int memberid) +OSyncChange *osync_mapping_engine_member_change(OSyncMappingEngine *engine, osync_memberid memberid) { OSyncList *e = NULL; osync_assert(engine); @@ -625,7 +625,7 @@ OSyncObjEngine *objengine = NULL; OSyncArchive *archive = NULL; char *objtype = NULL; - long long int id = 0; + osync_mappingid id = 0; OSyncList *c = NULL; osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, engine, error); @@ -710,15 +710,15 @@ OSyncMappingEntryEngine *entry = e->data; if (entry->change) { if (osync_change_get_changetype(entry->change) == OSYNC_CHANGE_TYPE_MODIFIED || osync_change_get_changetype(entry->change) == OSYNC_CHANGE_TYPE_ADDED) { - osync_trace(TRACE_INTERNAL, "Appending entry %s, changetype %i from member %lli", osync_change_get_uid(entry->change), osync_change_get_changetype(entry->change), osync_member_get_id(osync_client_proxy_get_member(entry->sink_engine->proxy))); + osync_trace(TRACE_INTERNAL, "Appending entry %s, changetype %i from member %i", osync_change_get_uid(entry->change), osync_change_get_changetype(entry->change), osync_member_get_id(osync_client_proxy_get_member(entry->sink_engine->proxy))); entries = osync_list_append(entries, entry); } else { - osync_trace(TRACE_INTERNAL, "Removing entry %s, changetype %i from member %lli", osync_change_get_uid(entry->change), osync_change_get_changetype(entry->change), osync_member_get_id(osync_client_proxy_get_member(entry->sink_engine->proxy))); + osync_trace(TRACE_INTERNAL, "Removing entry %s, changetype %i from member %i", osync_change_get_uid(entry->change), osync_change_get_changetype(entry->change), osync_member_get_id(osync_client_proxy_get_member(entry->sink_engine->proxy))); osync_entry_engine_update(entry, NULL); } } else { - osync_trace(TRACE_INTERNAL, "member %lli does not have a entry", osync_member_get_id(osync_client_proxy_get_member(entry->sink_engine->proxy))); + osync_trace(TRACE_INTERNAL, "member %i does not have a entry", osync_member_get_id(osync_client_proxy_get_member(entry->sink_engine->proxy))); } } Modified: trunk/opensync/engine/opensync_mapping_engine.h ============================================================================== --- trunk/opensync/engine/opensync_mapping_engine.h Thu Jul 1 05:47:31 2010 (r6050) +++ trunk/opensync/engine/opensync_mapping_engine.h Mon Jul 5 20:51:38 2010 (r6051) @@ -28,7 +28,7 @@ * @param memberid The member id of the request change. * @returns The pointer to the change of the member. NULL if member doesn't have an entry in this mapping. */ -OSYNC_EXPORT OSyncChange *osync_mapping_engine_member_change(OSyncMappingEngine *engine, long long int memberid); +OSYNC_EXPORT OSyncChange *osync_mapping_engine_member_change(OSyncMappingEngine *engine, osync_memberid memberid); OSYNC_EXPORT OSyncMember *osync_mapping_engine_change_find_member(OSyncMappingEngine *engine, OSyncChange *change); Modified: trunk/opensync/engine/opensync_mapping_entry_engine.c ============================================================================== --- trunk/opensync/engine/opensync_mapping_entry_engine.c Thu Jul 1 05:47:31 2010 (r6050) +++ trunk/opensync/engine/opensync_mapping_entry_engine.c Mon Jul 5 20:51:38 2010 (r6051) @@ -219,7 +219,7 @@ OSyncChange *change = entry_engine->change; OSyncFormatConverterPath *path; - osync_trace(TRACE_INTERNAL, "Starting to convert change(%p:%s)/entry(uid:%s/id:%llu) from objtype %s and format %s", + osync_trace(TRACE_INTERNAL, "Starting to convert change(%p:%s)/entry(uid:%s/id:%u) from objtype %s and format %s", entry_engine->change, __NULLSTR(osync_change_get_uid(entry_engine->change)), osync_change_get_uid(entry_engine->change), Modified: trunk/opensync/engine/opensync_obj_engine.c ============================================================================== --- trunk/opensync/engine/opensync_obj_engine.c Thu Jul 1 05:47:31 2010 (r6050) +++ trunk/opensync/engine/opensync_obj_engine.c Mon Jul 5 20:51:38 2010 (r6051) @@ -394,8 +394,8 @@ * the current sinkengine, since there will be only one entry (for the current sinkengine) so there * is no need to compare */ - long long int memberid = osync_member_get_id(osync_client_proxy_get_member(sinkengine->proxy)); - osync_trace(TRACE_INTERNAL, "Sinkengine of member %lli", memberid); + osync_memberid memberid = osync_member_get_id(osync_client_proxy_get_member(sinkengine->proxy)); + osync_trace(TRACE_INTERNAL, "Sinkengine of member %i", memberid); unmapped_mappings = osync_list_copy(new_mappings); @@ -403,7 +403,7 @@ while (sinkengine->unmapped) { OSyncChange *change = sinkengine->unmapped->data; - osync_trace(TRACE_INTERNAL, "Looking for mapping for change %s, changetype %i from member %lli", osync_change_get_uid(change), osync_change_get_changetype(change), memberid); + osync_trace(TRACE_INTERNAL, "Looking for mapping for change %s, changetype %i from member %i", osync_change_get_uid(change), osync_change_get_changetype(change), memberid); /* See if there is an exisiting mapping, which fits the unmapped change */ result = _osync_obj_engine_mapping_find(unmapped_mappings, change, sinkengine, &mapping_engine, error); @@ -414,7 +414,7 @@ if (!mapping_engine) goto error; - osync_trace(TRACE_INTERNAL, "Unable to find mapping. Creating new mapping with id %lli", osync_mapping_get_id(mapping_engine->mapping)); + osync_trace(TRACE_INTERNAL, "Unable to find mapping. Creating new mapping with id %i", osync_mapping_get_id(mapping_engine->mapping)); /* TODO: what about _prepend (O(1)) instead of _append (O(n))? Order doesn't matter here - right? */ new_mappings = osync_list_append(new_mappings, mapping_engine); unmapped_mappings = osync_list_append(unmapped_mappings, mapping_engine); @@ -643,7 +643,7 @@ OSyncMappingEntry *entry = NULL; const char *objtype = NULL; const char *objengine_objtype = NULL; - long long int id = 0; + osync_mappingid id = 0; objengine_objtype = osync_obj_engine_get_objtype(engine); @@ -793,7 +793,7 @@ t = changetypes; mid = memberids; for (j = ids; j; j = j->next) { - long long int id = (long long int)GPOINTER_TO_INT(j->data); + osync_archiveid id = GPOINTER_TO_INT(j->data); OSyncMapping *ignored_mapping = osync_mapping_table_find_mapping(engine->mapping_table, id); Modified: trunk/opensync/engine/opensync_sink_engine.c ============================================================================== --- trunk/opensync/engine/opensync_sink_engine.c Thu Jul 1 05:47:31 2010 (r6050) +++ trunk/opensync/engine/opensync_sink_engine.c Mon Jul 5 20:51:38 2010 (r6051) @@ -235,7 +235,7 @@ OSyncChange *change = osync_entry_engine_get_change(entry_engine); osync_assert(change); - osync_trace(TRACE_INTERNAL, "Writing change %s, changetype %i, format %s , objtype %s from member %lli", + osync_trace(TRACE_INTERNAL, "Writing change %s, changetype %i, format %s , objtype %s from member %i", osync_change_get_uid(change), osync_change_get_changetype(change), osync_objformat_get_name(osync_change_get_objformat(change)), Modified: trunk/opensync/group/opensync_group.c ============================================================================== --- trunk/opensync/group/opensync_group.c Thu Jul 1 05:47:31 2010 (r6050) +++ trunk/opensync/group/opensync_group.c Mon Jul 5 20:51:38 2010 (r6051) @@ -76,16 +76,16 @@ #endif //not defined _WIN32 -static long long int osync_group_create_member_id(OSyncGroup *group) +static osync_memberid osync_group_create_member_id(OSyncGroup *group) { char *filename = NULL; - long long int i = 0; + osync_memberid i = 0; do { i++; if (filename) osync_free(filename); - filename = osync_strdup_printf("%s%c%lli", group->configdir, G_DIR_SEPARATOR, i); + filename = osync_strdup_printf("%s%c%i", group->configdir, G_DIR_SEPARATOR, i); } while (g_file_test(filename, G_FILE_TEST_EXISTS)); osync_free(filename); @@ -778,7 +778,7 @@ if (!osync_member_get_configdir(member)) { member->id = osync_group_create_member_id(group); - char *configdir = osync_strdup_printf("%s%c%lli", group->configdir, G_DIR_SEPARATOR, member->id); + char *configdir = osync_strdup_printf("%s%c%i", group->configdir, G_DIR_SEPARATOR, member->id); osync_member_set_configdir(member, configdir); osync_free(configdir); } @@ -794,7 +794,7 @@ osync_member_unref(member); } -OSyncMember *osync_group_find_member(OSyncGroup *group, long long int id) +OSyncMember *osync_group_find_member(OSyncGroup *group, osync_memberid id) { OSyncList *m = NULL; for (m = group->members; m; m = m->next) { @@ -980,14 +980,14 @@ return group->last_sync; } -void osync_group_set_conflict_resolution(OSyncGroup *group, OSyncConflictResolution res, long long int winner) +void osync_group_set_conflict_resolution(OSyncGroup *group, OSyncConflictResolution res, osync_memberid winner) { osync_assert(group); group->conflict_resolution = res; group->conflict_winner = winner; } -void osync_group_get_conflict_resolution(OSyncGroup *group, OSyncConflictResolution *res, long long int *winner) +void osync_group_get_conflict_resolution(OSyncGroup *group, OSyncConflictResolution *res, osync_memberid *winner) { osync_assert(group); osync_assert(res); Modified: trunk/opensync/group/opensync_group.h ============================================================================== --- trunk/opensync/group/opensync_group.h Thu Jul 1 05:47:31 2010 (r6050) +++ trunk/opensync/group/opensync_group.h Mon Jul 5 20:51:38 2010 (r6051) @@ -193,7 +193,7 @@ * @returns The member, or NULL if not found * */ -OSYNC_EXPORT OSyncMember *osync_group_find_member(OSyncGroup *group, long long int id); +OSYNC_EXPORT OSyncMember *osync_group_find_member(OSyncGroup *group, osync_memberid id); /** * @brief Returns a OSyncList that contains the OSyncMembers of this group @@ -271,7 +271,7 @@ * @param winner The Member ID which solves the conflict (winner) * */ -OSYNC_EXPORT void osync_group_set_conflict_resolution(OSyncGroup *group, OSyncConflictResolution res, long long int winner); +OSYNC_EXPORT void osync_group_set_conflict_resolution(OSyncGroup *group, OSyncConflictResolution res, osync_memberid winner); /** @brief Get fixed conflict resolution for the group for all appearing conflicts * @@ -280,7 +280,7 @@ * @param winner Pointer to set Member ID value which solves the conflict (winner) * */ -OSYNC_EXPORT void osync_group_get_conflict_resolution(OSyncGroup *group, OSyncConflictResolution *res, long long int *winner); +OSYNC_EXPORT void osync_group_get_conflict_resolution(OSyncGroup *group, OSyncConflictResolution *res, osync_memberid *winner); /** @brief Get group configured status of merger use. * Modified: trunk/opensync/group/opensync_group_env.c ============================================================================== --- trunk/opensync/group/opensync_group_env.c Thu Jul 1 05:47:31 2010 (r6050) +++ trunk/opensync/group/opensync_group_env.c Mon Jul 5 20:51:38 2010 (r6051) @@ -26,15 +26,15 @@ #include "opensync_group_env_internals.h" #include "opensync_group_env_private.h" -static long long int osync_group_env_create_group_id(OSyncGroupEnv *env) +static osync_groupid osync_group_env_create_group_id(OSyncGroupEnv *env) { char *filename = NULL; - long long int i = 0; + osync_groupid i = 0; do { i++; if (filename) osync_free(filename); - filename = osync_strdup_printf("%s%cgroup%lli", env->groupsdir, G_DIR_SEPARATOR, i); + filename = osync_strdup_printf("%s%cgroup%i", env->groupsdir, G_DIR_SEPARATOR, i); } while (g_file_test(filename, G_FILE_TEST_EXISTS)); osync_free(filename); return i; @@ -409,7 +409,7 @@ } if (!osync_group_get_configdir(group)) { - char *configdir = osync_strdup_printf("%s%cgroup%lli", env->groupsdir, G_DIR_SEPARATOR, osync_group_env_create_group_id(env)); + char *configdir = osync_strdup_printf("%s%cgroup%i", env->groupsdir, G_DIR_SEPARATOR, osync_group_env_create_group_id(env)); osync_group_set_configdir(group, configdir); osync_free(configdir); } Modified: trunk/opensync/group/opensync_group_env_private.h ============================================================================== --- trunk/opensync/group/opensync_group_env_private.h Thu Jul 1 05:47:31 2010 (r6050) +++ trunk/opensync/group/opensync_group_env_private.h Mon Jul 5 20:51:38 2010 (r6051) @@ -37,7 +37,7 @@ * @returns The next free number * */ -static long long int osync_group_env_create_group_id(OSyncGroupEnv *env); +static osync_groupid osync_group_env_create_group_id(OSyncGroupEnv *env); /*@}*/ Modified: trunk/opensync/group/opensync_group_internals.h ============================================================================== --- trunk/opensync/group/opensync_group_internals.h Thu Jul 1 05:47:31 2010 (r6050) +++ trunk/opensync/group/opensync_group_internals.h Mon Jul 5 20:51:38 2010 (r6051) @@ -52,7 +52,7 @@ /** The defined resolution for this group */ OSyncConflictResolution conflict_resolution; /** The winning side if the select resolution is choosen */ - long long int conflict_winner; + osync_memberid conflict_winner; /** The configured merger status of this group */ osync_bool merger_enabled; /** The configured converter status of this group */ Modified: trunk/opensync/group/opensync_group_private.h ============================================================================== --- trunk/opensync/group/opensync_group_private.h Thu Jul 1 05:47:31 2010 (r6050) +++ trunk/opensync/group/opensync_group_private.h Mon Jul 5 20:51:38 2010 (r6051) @@ -36,7 +36,7 @@ * @returns A new unique member id * */ -static long long int osync_group_create_member_id(OSyncGroup *group); +static osync_memberid osync_group_create_member_id(OSyncGroup *group); /** @brief Loads all members of a group * Modified: trunk/opensync/group/opensync_member.c ============================================================================== --- trunk/opensync/group/opensync_member.c Thu Jul 1 05:47:31 2010 (r6050) +++ trunk/opensync/group/opensync_member.c Mon Jul 5 20:51:38 2010 (r6051) @@ -541,7 +541,7 @@ * member_configdir_deep_path */ if (g_mkdir_with_parents(member->configdir, 0700)) { - osync_error_set(error, OSYNC_ERROR_IO_ERROR, "Unable to create directory for member %lli\n", member->id); + osync_error_set(error, OSYNC_ERROR_IO_ERROR, "Unable to create directory for member %i\n", member->id); goto error; } } @@ -630,7 +630,7 @@ return TRUE; } -long long int osync_member_get_id(OSyncMember *member) +osync_memberid osync_member_get_id(OSyncMember *member) { osync_assert(member); return member->id; Modified: trunk/opensync/group/opensync_member.h ============================================================================== --- trunk/opensync/group/opensync_member.h Thu Jul 1 05:47:31 2010 (r6050) +++ trunk/opensync/group/opensync_member.h Mon Jul 5 20:51:38 2010 (r6051) @@ -191,7 +191,7 @@ * @returns The id of the member thats unique in its group * */ -OSYNC_EXPORT long long int osync_member_get_id(OSyncMember *member); +OSYNC_EXPORT osync_memberid osync_member_get_id(OSyncMember *member); /** * @brief Returns a OSyncList that contains the objtypes of this member Modified: trunk/opensync/group/opensync_member_internals.h ============================================================================== --- trunk/opensync/group/opensync_member_internals.h Thu Jul 1 05:47:31 2010 (r6050) +++ trunk/opensync/group/opensync_member_internals.h Mon Jul 5 20:51:38 2010 (r6051) @@ -31,7 +31,7 @@ /** @brief A member of a group which represent a single device */ struct OSyncMember { - long long int id; + osync_memberid id; char *configdir; OSyncPluginConfig *config; Modified: trunk/opensync/ipc/opensync_message.c ============================================================================== --- trunk/opensync/ipc/opensync_message.c Thu Jul 1 05:47:31 2010 (r6050) +++ trunk/opensync/ipc/opensync_message.c Mon Jul 5 20:51:38 2010 (r6051) @@ -87,13 +87,13 @@ return message->timeout; } -void osync_message_set_id(OSyncMessage *message, long long int id) +void osync_message_set_id(OSyncMessage *message, osync_messageid id) { osync_assert(message); message->id = id; } -long long int osync_message_get_id(OSyncMessage *message) +osync_messageid osync_message_get_id(OSyncMessage *message) { osync_assert(message); return message->id; Modified: trunk/opensync/ipc/opensync_message_internals.h ============================================================================== --- trunk/opensync/ipc/opensync_message_internals.h Thu Jul 1 05:47:31 2010 (r6050) +++ trunk/opensync/ipc/opensync_message_internals.h Mon Jul 5 20:51:38 2010 (r6051) @@ -149,7 +149,7 @@ * @param id The ID which get set for supplied message object * */ -OSYNC_TEST_EXPORT void osync_message_set_id(OSyncMessage *message, long long int id); +OSYNC_TEST_EXPORT void osync_message_set_id(OSyncMessage *message, osync_messageid id); /** @brief Get message ID of supplied message object * @@ -157,7 +157,7 @@ * @returns The message ID of supplied message * */ -OSYNC_TEST_EXPORT long long int osync_message_get_id(OSyncMessage *message); +OSYNC_TEST_EXPORT osync_messageid osync_message_get_id(OSyncMessage *message); /** @brief Get marshal object of supplied message object * Modified: trunk/opensync/ipc/opensync_message_private.h ============================================================================== --- trunk/opensync/ipc/opensync_message_private.h Thu Jul 1 05:47:31 2010 (r6050) +++ trunk/opensync/ipc/opensync_message_private.h Mon Jul 5 20:51:38 2010 (r6051) @@ -39,7 +39,7 @@ /** The type of this message */ OSyncMessageCommand cmd; /** The name of the message*/ - long long int id; + osync_messageid id; /** Where should the reply be received? */ OSyncMessageHandler callback; /** The user data */ Modified: trunk/opensync/ipc/opensync_queue.c ============================================================================== --- trunk/opensync/ipc/opensync_queue.c Thu Jul 1 05:47:31 2010 (r6050) +++ trunk/opensync/ipc/opensync_queue.c Mon Jul 5 20:51:38 2010 (r6051) @@ -689,7 +689,7 @@ do { int size = 0; int cmd = 0, timeout = 0; - long long int id = 0; + osync_messageid id = 0; char *buffer = NULL; /* The size of the buffer */ @@ -1367,7 +1367,7 @@ return g_async_queue_pop(queue->incoming); } -static long long int opensync_queue_gen_id(const GTimeVal *tv) +static osync_messageid opensync_queue_gen_id(const GTimeVal *tv) { long long int now = (tv->tv_sec * 1000000 + tv->tv_usec) << 16; long long int rnd = ((long long int)g_random_int()) & 0xFFFF; @@ -1400,7 +1400,7 @@ if (osync_message_get_handler(message)) { OSyncPendingMessage *pending = NULL; GTimeVal current_time; - long long int id = 0; + osync_messageid id = 0; osync_assert(replyqueue); g_mutex_lock(replyqueue->pendingLock); Modified: trunk/opensync/ipc/opensync_queue_private.h ============================================================================== --- trunk/opensync/ipc/opensync_queue_private.h Thu Jul 1 05:47:31 2010 (r6050) +++ trunk/opensync/ipc/opensync_queue_private.h Mon Jul 5 20:51:38 2010 (r6051) @@ -134,7 +134,7 @@ */ typedef struct OSyncPendingMessage { /** ID of the expected Message */ - long long int id; + osync_messageid id; /** Where should the reply be received? */ OSyncMessageHandler callback; /** The user data */ @@ -151,7 +151,7 @@ * the lower 2 bytes are a random number * * */ -static long long int opensync_queue_gen_id(const GTimeVal *tv); +static osync_messageid opensync_queue_gen_id(const GTimeVal *tv); /** @brief Flush all message of the Queue * Modified: trunk/opensync/mapping/opensync_mapping.c ============================================================================== --- trunk/opensync/mapping/opensync_mapping.c Thu Jul 1 05:47:31 2010 (r6050) +++ trunk/opensync/mapping/opensync_mapping.c Mon Jul 5 20:51:38 2010 (r6051) @@ -68,13 +68,13 @@ } } -long long int osync_mapping_get_id(OSyncMapping *mapping) +osync_mappingid osync_mapping_get_id(OSyncMapping *mapping) { osync_assert(mapping); return mapping->id; } -void osync_mapping_set_id(OSyncMapping *mapping, long long int id) +void osync_mapping_set_id(OSyncMapping *mapping, osync_mappingid id) { osync_assert(mapping); mapping->id = id; @@ -109,7 +109,7 @@ return NULL; }*/ -OSyncMappingEntry *osync_mapping_find_entry_by_member_id(OSyncMapping *mapping, long long int memberid) +OSyncMappingEntry *osync_mapping_find_entry_by_member_id(OSyncMapping *mapping, osync_memberid memberid) { OSyncList *e; for (e = mapping->entries; e; e = e->next) { Modified: trunk/opensync/mapping/opensync_mapping.h ============================================================================== --- trunk/opensync/mapping/opensync_mapping.h Thu Jul 1 05:47:31 2010 (r6050) +++ trunk/opensync/mapping/opensync_mapping.h Mon Jul 5 20:51:38 2010 (r6051) @@ -62,14 +62,14 @@ * @param mapping Pointer to a mapping object * @returns the mapping ID */ -OSYNC_EXPORT long long int osync_mapping_get_id(OSyncMapping *mapping); +OSYNC_EXPORT osync_mappingid osync_mapping_get_id(OSyncMapping *mapping); /** * @brief Set the ID of a mapping object * @param mapping Pointer to a mapping object * @param id the mapping ID to set */ -OSYNC_EXPORT void osync_mapping_set_id(OSyncMapping *mapping, long long int id); +OSYNC_EXPORT void osync_mapping_set_id(OSyncMapping *mapping, osync_mappingid id); /** * @brief Returns a OSyncList that contains the OSyncMappingEntries of this mapping @@ -103,7 +103,7 @@ * @param memberid The ID of the member * @returns the entry with the specified member ID or NULL if not found */ -OSYNC_EXPORT OSyncMappingEntry *osync_mapping_find_entry_by_member_id(OSyncMapping *mapping, long long int memberid); +OSYNC_EXPORT OSyncMappingEntry *osync_mapping_find_entry_by_member_id(OSyncMapping *mapping, osync_memberid memberid); /*@}*/ Modified: trunk/opensync/mapping/opensync_mapping_entry.c ============================================================================== --- trunk/opensync/mapping/opensync_mapping_entry.c Thu Jul 1 05:47:31 2010 (r6050) +++ trunk/opensync/mapping/opensync_mapping_entry.c Mon Jul 5 20:51:38 2010 (r6051) @@ -124,25 +124,25 @@ return entry->uid; } -long long int osync_mapping_entry_get_member_id(OSyncMappingEntry *entry) +osync_memberid osync_mapping_entry_get_member_id(OSyncMappingEntry *entry) { osync_assert(entry); return entry->member_id; } -void osync_mapping_entry_set_member_id(OSyncMappingEntry *entry, long long int id) +void osync_mapping_entry_set_member_id(OSyncMappingEntry *entry, osync_memberid id) { osync_assert(entry); entry->member_id = id; } -long long int osync_mapping_entry_get_id(OSyncMappingEntry *entry) +osync_mappingid osync_mapping_entry_get_id(OSyncMappingEntry *entry) { osync_assert(entry); return entry->id; } -void osync_mapping_entry_set_id(OSyncMappingEntry *entry, long long int id) +void osync_mapping_entry_set_id(OSyncMappingEntry *entry, osync_mappingid id) { osync_assert(entry); entry->id = id; Modified: trunk/opensync/mapping/opensync_mapping_entry.h ============================================================================== --- trunk/opensync/mapping/opensync_mapping_entry.h Thu Jul 1 05:47:31 2010 (r6050) +++ trunk/opensync/mapping/opensync_mapping_entry.h Mon Jul 5 20:51:38 2010 (r6051) @@ -98,14 +98,14 @@ * @param entry Pointer to a mapping entry object * @returns the entry's member ID */ -OSYNC_EXPORT long long int osync_mapping_entry_get_member_id(OSyncMappingEntry *entry); +OSYNC_EXPORT osync_memberid osync_mapping_entry_get_member_id(OSyncMappingEntry *entry); /** * @brief Set the member ID of the entry * @param entry Pointer to a mapping entry object * @param id the member ID to set */ -OSYNC_EXPORT void osync_mapping_entry_set_member_id(OSyncMappingEntry *entry, long long int id); +OSYNC_EXPORT void osync_mapping_entry_set_member_id(OSyncMappingEntry *entry, osync_memberid id); /** @@ -113,14 +113,14 @@ * @param entry Pointer to a mapping entry object * @returns the entry's ID */ -OSYNC_EXPORT long long int osync_mapping_entry_get_id(OSyncMappingEntry *entry); +OSYNC_EXPORT osync_mappingid osync_mapping_entry_get_id(OSyncMappingEntry *entry); /** * @brief Set the ID of the entry * @param entry Pointer to a mapping entry object * @param id the ID to set */ -OSYNC_EXPORT void osync_mapping_entry_set_id(OSyncMappingEntry *entry, long long int id); +OSYNC_EXPORT void osync_mapping_entry_set_id(OSyncMappingEntry *entry, osync_mappingid id); /*@}*/ Modified: trunk/opensync/mapping/opensync_mapping_entry_internals.h ============================================================================== --- trunk/opensync/mapping/opensync_mapping_entry_internals.h Thu Jul 1 05:47:31 2010 (r6050) +++ trunk/opensync/mapping/opensync_mapping_entry_internals.h Mon Jul 5 20:51:38 2010 (r6051) @@ -40,9 +40,9 @@ char *uid; /** uniquely identifies the member */ - long long int member_id; + osync_memberid member_id; /** uniquely identifies the mapping table entry */ - long long int id; + osync_mappingid id; }; /*@}*/ Modified: trunk/opensync/mapping/opensync_mapping_internals.h ============================================================================== --- trunk/opensync/mapping/opensync_mapping_internals.h Thu Jul 1 05:47:31 2010 (r6050) +++ trunk/opensync/mapping/opensync_mapping_internals.h Mon Jul 5 20:51:38 2010 (r6051) @@ -38,7 +38,7 @@ /** Reference Counter */ int ref_count; /** ID of the mapping */ - long long int id; + osync_mappingid id; /** list of entries */ OSyncList *entries; }; Modified: trunk/opensync/mapping/opensync_mapping_table.c ============================================================================== --- trunk/opensync/mapping/opensync_mapping_table.c Thu Jul 1 05:47:31 2010 (r6050) +++ trunk/opensync/mapping/opensync_mapping_table.c Mon Jul 5 20:51:38 2010 (r6051) @@ -88,10 +88,12 @@ i = memberids; for (u = uids; u; u = u->next) { - long long int id = (long long int)GPOINTER_TO_INT(d->data); + // FIXME - GPOINTER_TO_INT() only guarantees 32bits of data, + // while long long int is 64bits. + osync_archiveid id = GPOINTER_TO_INT(d->data); char *uid = u->data; - long long int memberid = (long long int)GPOINTER_TO_INT(i->data); - long long int mappingid = (long long int)GPOINTER_TO_INT(m->data); + osync_memberid memberid = GPOINTER_TO_INT(i->data); + osync_mappingid mappingid = GPOINTER_TO_INT(m->data); entry = osync_mapping_entry_new(error); if (!entry) @@ -171,7 +173,7 @@ osync_trace(TRACE_EXIT, "%s", __func__); } -OSyncMapping *osync_mapping_table_find_mapping(OSyncMappingTable *table, long long int id) +OSyncMapping *osync_mapping_table_find_mapping(OSyncMappingTable *table, osync_mappingid id) { OSyncList *m; osync_assert(table); @@ -214,9 +216,9 @@ return osync_list_nth_data(table->mappings, nth); } -long long int osync_mapping_table_get_next_id(OSyncMappingTable *table) +osync_mappingid osync_mapping_table_get_next_id(OSyncMappingTable *table) { - long long int new_id = 1; + osync_mappingid new_id = 1; OSyncList *m; for (m = table->mappings; m; m = m->next) { OSyncMapping *mapping = m->data; Modified: trunk/opensync/mapping/opensync_mapping_table.h ============================================================================== --- trunk/opensync/mapping/opensync_mapping_table.h Thu Jul 1 05:47:31 2010 (r6050) +++ trunk/opensync/mapping/opensync_mapping_table.h Mon Jul 5 20:51:38 2010 (r6051) @@ -90,7 +90,7 @@ * @param id The mapping id to search for * @return Returns Mapping object or NULL if no mapping matched the mapping id */ -OSYNC_EXPORT OSyncMapping *osync_mapping_table_find_mapping(OSyncMappingTable *table, long long int id); +OSYNC_EXPORT OSyncMapping *osync_mapping_table_find_mapping(OSyncMappingTable *table, osync_mappingid id); /** * @brief Add a mapping to the mapping table @@ -125,7 +125,7 @@ * @param table The mapping table object * @return Next free mapping id of mapping table */ -OSYNC_EXPORT long long int osync_mapping_table_get_next_id(OSyncMappingTable *table); +OSYNC_EXPORT osync_mappingid osync_mapping_table_get_next_id(OSyncMappingTable *table); /*@}*/ Modified: trunk/opensync/opensync.h ============================================================================== --- trunk/opensync/opensync.h Thu Jul 1 05:47:31 2010 (r6050) +++ trunk/opensync/opensync.h Mon Jul 5 20:51:38 2010 (r6051) @@ -157,6 +157,11 @@ } } while(0) typedef int osync_bool; +typedef int osync_memberid; +typedef int osync_mappingid; +typedef int osync_groupid; +typedef long long int osync_archiveid; +typedef long long int osync_messageid; /************************************************************** * Enums Modified: trunk/opensync/plugin/opensync_plugin_info_private.h ============================================================================== --- trunk/opensync/plugin/opensync_plugin_info_private.h Thu Jul 1 05:47:31 2010 (r6050) +++ trunk/opensync/plugin/opensync_plugin_info_private.h Mon Jul 5 20:51:38 2010 (r6051) @@ -49,7 +49,7 @@ OSyncCapabilities *capabilities; #ifdef OPENSYNC_UNITTESTS - long long int memberid; // introduced only for testing purpose (mock-sync) + osync_memberid memberid; // introduced only for testing purpose (mock-sync) #endif }; Modified: trunk/tests/archive-tests/check_archive.c ============================================================================== --- trunk/tests/archive-tests/check_archive.c Thu Jul 1 05:47:31 2010 (r6050) +++ trunk/tests/archive-tests/check_archive.c Mon Jul 5 20:51:38 2010 (r6051) @@ -58,7 +58,7 @@ OSyncList *memberids; osync_archive_load_changes(archive, "contact", &ids, &uids, &mappingids, &memberids, &error); - long long int id = osync_archive_save_change(archive, 0, "uid", "contact", 1, 1, "contact", &error); + osync_archiveid id = osync_archive_save_change(archive, 0, "uid", "contact", 1, 1, "contact", &error); fail_unless(id != 0, NULL); fail_unless(error == NULL, NULL); @@ -83,7 +83,7 @@ OSyncList *memberids; osync_archive_load_changes(archive, "contact", &ids, &uids, &mappingids, &memberids, &error); - long long int id = osync_archive_save_change(archive, 0, "uid", "contact", 1, 1, "contact", &error); + osync_archiveid id = osync_archive_save_change(archive, 0, "uid", "contact", 1, 1, "contact", &error); fail_unless(id != 0, NULL); fail_unless(error == NULL, NULL); @@ -113,7 +113,7 @@ OSyncList *memberids; osync_archive_load_changes(archive, "contact", &ids, &uids, &mappingids, &memberids, &error); - long long int id = osync_archive_save_change(archive, 0, "uid", "contact", 1, 1, "contact", &error); + osync_archiveid id = osync_archive_save_change(archive, 0, "uid", "contact", 1, 1, "contact", &error); fail_unless(id != 0, NULL); fail_unless(error == NULL, NULL); @@ -152,7 +152,7 @@ OSyncList *memberids; osync_archive_load_changes(archive, "contact", &ids, &uids, &mappingids, &memberids, &error); - long long int id = osync_archive_save_change(archive, 0, "uid", "contact", 1, 1, "contact", &error); + osync_archiveid id = osync_archive_save_change(archive, 0, "uid", "contact", 1, 1, "contact", &error); fail_unless(id != 0, NULL); fail_unless(error == NULL, NULL); Modified: trunk/tests/mock-plugin/mock_sync.c ============================================================================== --- trunk/tests/mock-plugin/mock_sync.c Thu Jul 1 05:47:31 2010 (r6050) +++ trunk/tests/mock-plugin/mock_sync.c Mon Jul 5 20:51:38 2010 (r6051) @@ -23,7 +23,7 @@ #include "opensync/plugin/opensync_plugin_info_private.h" /* FIXME: access direclty private header */ -static osync_bool mock_get_error(long long int memberid, const char *domain) +static osync_bool mock_get_error(osync_memberid memberid, const char *domain) { const char *env = g_getenv(domain); Modified: trunk/wrapper/opensync-group.i ============================================================================== --- trunk/wrapper/opensync-group.i Thu Jul 1 05:47:31 2010 (r6050) +++ trunk/wrapper/opensync-group.i Mon Jul 5 20:51:38 2010 (r6051) @@ -232,7 +232,7 @@ %apply ConflictResolution *OUTPUT { ConflictResolution *res, int *num }; %apply int *OUTPUT { ConflictResolution *res, int *num }; - void get_conflict_resolution(ConflictResolution *res, long long int *winner) { + void get_conflict_resolution(ConflictResolution *res, osync_memberid *winner) { osync_group_get_conflict_resolution(self, res, winner); } @@ -357,7 +357,7 @@ wrapper_exception("osync_member_delete failed but did not set error code"); } - long long int get_id() { + osync_memberid get_id() { return osync_member_get_id(self); } |
