Menu
▾
▴
[Opensync-commits] r5956 - in trunk: opensync opensync/archive opensync/client opensync/common opensync/data opensync/engine opensync/format opensync/group opensync/plugin tests/mock-plugin
Author: cdfrey Date: Wed Nov 11 00:20:20 2009 New Revision: 5956 URL: http://www.opensync.org/changeset/5956 Log: Fixed all format errors reported by new GCC_FORMAT_CHECK Modified: trunk/opensync/archive/opensync_archive.c trunk/opensync/client/opensync_client_proxy.c trunk/opensync/common/opensync_thread.c trunk/opensync/data/opensync_data.c trunk/opensync/engine/opensync_engine.c trunk/opensync/format/opensync_caps_converter.c trunk/opensync/format/opensync_time.c trunk/opensync/group/opensync_group.c trunk/opensync/group/opensync_member.c trunk/opensync/opensync.h trunk/opensync/plugin/opensync_plugin_config.c trunk/tests/mock-plugin/mock_format.c Modified: trunk/opensync/archive/opensync_archive.c ============================================================================== --- trunk/opensync/archive/opensync_archive.c Wed Nov 11 00:18:28 2009 (r5955) +++ trunk/opensync/archive/opensync_archive.c Wed Nov 11 00:20:20 2009 (r5956) @@ -288,7 +288,7 @@ char *escaped_objtype = NULL; char *escaped_objengine = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %lli, %s, %s, %lli, %lli, %p, %s)", __func__, archive, id, uid, objtype, mappingid, memberid, __NULLSTR(objengine), error); + osync_trace(TRACE_ENTRY, "%s(%p, %lli, %s, %s, %lli, %lli, %p, %p)", __func__, archive, id, uid, objtype, mappingid, memberid, __NULLSTR(objengine), error); osync_assert(archive); osync_assert(uid); osync_assert(objtype); Modified: trunk/opensync/client/opensync_client_proxy.c ============================================================================== --- trunk/opensync/client/opensync_client_proxy.c Wed Nov 11 00:18:28 2009 (r5955) +++ trunk/opensync/client/opensync_client_proxy.c Wed Nov 11 00:20:20 2009 (r5956) @@ -1296,7 +1296,7 @@ long long int memberid = 0; #endif - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %s, %s, %s, %s, %p, %p)", __func__, proxy, callback, userdata, formatdir, plugindir, plugin, groupname, configdir, config, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %s, %s, %s, %s, %s, %p, %p)", __func__, proxy, callback, userdata, formatdir, plugindir, plugin, groupname, configdir, config, error); osync_assert(proxy); @@ -1446,7 +1446,7 @@ callContext *ctx = NULL; OSyncMessage *message = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, proxy, callback, userdata, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, proxy, callback, userdata, error); ctx = osync_try_malloc0(sizeof(callContext), error); if (!ctx) Modified: trunk/opensync/common/opensync_thread.c ============================================================================== --- trunk/opensync/common/opensync_thread.c Wed Nov 11 00:18:28 2009 (r5955) +++ trunk/opensync/common/opensync_thread.c Wed Nov 11 00:20:20 2009 (r5956) @@ -149,7 +149,7 @@ error_free_thread: osync_free(thread); error: - osync_trace(TRACE_EXIT_ERROR, "%s", __func__, osync_error_print(error)); + osync_trace(TRACE_EXIT_ERROR, "%s(%s)", __func__, osync_error_print(error)); return NULL; } Modified: trunk/opensync/data/opensync_data.c ============================================================================== --- trunk/opensync/data/opensync_data.c Wed Nov 11 00:18:28 2009 (r5955) +++ trunk/opensync/data/opensync_data.c Wed Nov 11 00:20:20 2009 (r5956) @@ -246,7 +246,7 @@ return -1; } - osync_trace(TRACE_EXIT, "%s: %i", __func__, time); + osync_trace(TRACE_EXIT, "%s: %li", __func__, time); return time; } Modified: trunk/opensync/engine/opensync_engine.c ============================================================================== --- trunk/opensync/engine/opensync_engine.c Wed Nov 11 00:18:28 2009 (r5955) +++ trunk/opensync/engine/opensync_engine.c Wed Nov 11 00:20:20 2009 (r5956) @@ -955,7 +955,7 @@ osync_bool osync_engine_check_get_changes(OSyncEngine *engine) { if (osync_bitcount(engine->proxy_errors | engine->proxy_get_changes) != osync_list_length(engine->proxies)) { - osync_trace(TRACE_INTERNAL, "Not yet. main sinks still need to read: %i", osync_bitcount(engine->proxy_errors | engine->proxy_get_changes), osync_list_length(engine->proxies)); + osync_trace(TRACE_INTERNAL, "Not yet. main sinks still need to read: %i (%u)", osync_bitcount(engine->proxy_errors | engine->proxy_get_changes), osync_list_length(engine->proxies)); return FALSE; } Modified: trunk/opensync/format/opensync_caps_converter.c ============================================================================== --- trunk/opensync/format/opensync_caps_converter.c Wed Nov 11 00:18:28 2009 (r5955) +++ trunk/opensync/format/opensync_caps_converter.c Wed Nov 11 00:20:20 2009 (r5956) @@ -36,7 +36,7 @@ OSyncCapsConverter *osync_caps_converter_new(const char *sourceformat, const char *targetformat, OSyncCapsConvertFunc convert_func, OSyncError **error) { OSyncCapsConverter *converter = NULL; - osync_trace(TRACE_ENTRY, "%s(%s, %s, %p, %p)", __func__, __NULLSTR(sourceformat), sourceformat, __NULLSTR(targetformat), targetformat, convert_func, error); + osync_trace(TRACE_ENTRY, "%s(%s, %p, %s, %p, %p, %p)", __func__, __NULLSTR(sourceformat), sourceformat, __NULLSTR(targetformat), targetformat, convert_func, error); converter = osync_try_malloc0(sizeof(OSyncCapsConverter), error); if (!converter) { Modified: trunk/opensync/format/opensync_time.c ============================================================================== --- trunk/opensync/format/opensync_time.c Wed Nov 11 00:18:28 2009 (r5955) +++ trunk/opensync/format/opensync_time.c Wed Nov 11 00:20:20 2009 (r5956) @@ -479,7 +479,7 @@ zonediff += daydiff; } - osync_trace(TRACE_EXIT, "%s: %i", __func__, zonediff); + osync_trace(TRACE_EXIT, "%s: %li", __func__, zonediff); return zonediff; error: osync_trace(TRACE_EXIT, "%s", __func__); Modified: trunk/opensync/group/opensync_group.c ============================================================================== --- trunk/opensync/group/opensync_group.c Wed Nov 11 00:18:28 2009 (r5955) +++ trunk/opensync/group/opensync_group.c Wed Nov 11 00:20:20 2009 (r5956) @@ -966,7 +966,7 @@ void osync_group_set_last_synchronization(OSyncGroup *group, time_t last_sync) { - osync_trace(TRACE_ENTRY, "%s(%p, %i)", __func__, group, last_sync); + osync_trace(TRACE_ENTRY, "%s(%p, %li)", __func__, group, last_sync); osync_assert(group); group->last_sync = last_sync; Modified: trunk/opensync/group/opensync_member.c ============================================================================== --- trunk/opensync/group/opensync_member.c Wed Nov 11 00:18:28 2009 (r5955) +++ trunk/opensync/group/opensync_member.c Wed Nov 11 00:20:20 2009 (r5956) @@ -540,7 +540,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 %li\n", member->id); + osync_error_set(error, OSYNC_ERROR_IO_ERROR, "Unable to create directory for member %lli\n", member->id); goto error; } } Modified: trunk/opensync/opensync.h ============================================================================== --- trunk/opensync/opensync.h Wed Nov 11 00:18:28 2009 (r5955) +++ trunk/opensync/opensync.h Wed Nov 11 00:20:20 2009 (r5956) @@ -130,13 +130,13 @@ #define osync_return_if_fail_and_set_error(condition, error, errortype, format, ...) do { \ if (!(condition)) { \ - osync_error_set(error, errortype, format,## __VA_ARGS__, NULL ); \ + osync_error_set(error, errortype, format,## __VA_ARGS__); \ return; \ } } while(0) #define osync_return_val_if_fail_and_set_error(condition, val, error, errortype, format, ...) do { \ if (!(condition)) { \ - osync_error_set(error, errortype, format,## __VA_ARGS__, NULL ); \ + osync_error_set(error, errortype, format,## __VA_ARGS__); \ return (val); \ } } while(0) Modified: trunk/opensync/plugin/opensync_plugin_config.c ============================================================================== --- trunk/opensync/plugin/opensync_plugin_config.c Wed Nov 11 00:18:28 2009 (r5955) +++ trunk/opensync/plugin/opensync_plugin_config.c Wed Nov 11 00:20:20 2009 (r5956) @@ -797,7 +797,7 @@ char *schemafile = NULL; const char *schemapath = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %s, %s, %p)", __func__, config, __NULLSTR(path), error); + osync_trace(TRACE_ENTRY, "%s(%p, %s, %p, %p)", __func__, config, __NULLSTR(path), path, error); schemapath = config->schemadir ? config->schemadir : OPENSYNC_SCHEMASDIR; Modified: trunk/tests/mock-plugin/mock_format.c ============================================================================== --- trunk/tests/mock-plugin/mock_format.c Wed Nov 11 00:18:28 2009 (r5955) +++ trunk/tests/mock-plugin/mock_format.c Wed Nov 11 00:20:20 2009 (r5956) @@ -194,7 +194,7 @@ OSyncFileFormat *file = (OSyncFileFormat *)input; time_t lastmod = file->last_mod; - osync_trace(TRACE_EXIT, "%s: %i", __func__, lastmod); + osync_trace(TRACE_EXIT, "%s: %li", __func__, lastmod); return lastmod; } |
