Menu
▾
▴
[Opensync-commits] r5349 - in trunk: opensync/client opensync/plugin tools
|
From: <svn...@op...> - 2009-03-26 13:25:25
|
Author: ianmartin Date: Thu Mar 26 14:25:12 2009 New Revision: 5349 URL: http://www.opensync.org/changeset/5349 Log: Move sync function userdata determination into osync_objtype_sink_<sink_function>. This forces all callers of pluing sync functions to pass the user data the plugin set for the sink. Fixes bug with osyncplugin passing plugindata to plugin sync functions Modified: trunk/opensync/client/opensync_client.c trunk/opensync/plugin/opensync_objtype_sink.c trunk/opensync/plugin/opensync_objtype_sink.h trunk/tools/osyncplugin.c Modified: trunk/opensync/client/opensync_client.c ============================================================================== --- trunk/opensync/client/opensync_client.c Thu Mar 26 04:20:31 2009 (r5348) +++ trunk/opensync/client/opensync_client.c Thu Mar 26 14:25:12 2009 (r5349) @@ -967,7 +967,7 @@ goto error; osync_plugin_info_set_sink(client->plugin_info, sink); - osync_objtype_sink_connect(sink, osync_objtype_sink_get_userdata(sink), client->plugin_info, context); + osync_objtype_sink_connect(sink, client->plugin_info, context); osync_context_unref(context); } @@ -1022,7 +1022,7 @@ goto error; osync_plugin_info_set_sink(client->plugin_info, sink); - osync_objtype_sink_connect_done(sink, osync_objtype_sink_get_userdata(sink), client->plugin_info, context); + osync_objtype_sink_connect_done(sink, client->plugin_info, context); osync_context_unref(context); } @@ -1076,7 +1076,7 @@ goto error; osync_plugin_info_set_sink(client->plugin_info, sink); - osync_objtype_sink_disconnect(sink, osync_objtype_sink_get_userdata(sink), client->plugin_info, context); + osync_objtype_sink_disconnect(sink, client->plugin_info, context); osync_context_unref(context); } @@ -1141,7 +1141,7 @@ osync_plugin_info_set_sink(client->plugin_info, sink); - osync_objtype_sink_get_changes(sink, osync_objtype_sink_get_userdata(sink), client->plugin_info, context); + osync_objtype_sink_get_changes(sink, client->plugin_info, context); osync_context_unref(context); } @@ -1200,7 +1200,7 @@ osync_plugin_info_set_sink(client->plugin_info, sink); - osync_objtype_sink_read_change(sink, osync_objtype_sink_get_userdata(sink), client->plugin_info, change, context); + osync_objtype_sink_read_change(sink, client->plugin_info, change, context); osync_context_unref(context); } @@ -1247,7 +1247,7 @@ goto error; osync_plugin_info_set_sink(client->plugin_info, sink); - osync_objtype_sink_commit_change(sink, osync_objtype_sink_get_userdata(sink), client->plugin_info, change, context); + osync_objtype_sink_commit_change(sink, client->plugin_info, change, context); osync_change_unref(change); osync_context_unref(context); @@ -1300,7 +1300,7 @@ goto error; osync_plugin_info_set_sink(client->plugin_info, sink); - osync_objtype_sink_committed_all(sink, osync_objtype_sink_get_userdata(sink), client->plugin_info, context); + osync_objtype_sink_committed_all(sink, client->plugin_info, context); osync_context_unref(context); } @@ -1354,7 +1354,7 @@ goto error; osync_plugin_info_set_sink(client->plugin_info, sink); - osync_objtype_sink_sync_done(sink, osync_objtype_sink_get_userdata(sink), client->plugin_info, context); + osync_objtype_sink_sync_done(sink, client->plugin_info, context); osync_context_unref(context); } Modified: trunk/opensync/plugin/opensync_objtype_sink.c ============================================================================== --- trunk/opensync/plugin/opensync_objtype_sink.c Thu Mar 26 04:20:31 2009 (r5348) +++ trunk/opensync/plugin/opensync_objtype_sink.c Thu Mar 26 14:25:12 2009 (r5349) @@ -257,10 +257,10 @@ return sink->userdata; } -void osync_objtype_sink_get_changes(OSyncObjTypeSink *sink, void *plugindata, OSyncPluginInfo *info, OSyncContext *ctx) +void osync_objtype_sink_get_changes(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx) { OSyncObjTypeSinkFunctions functions; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, sink, plugindata, info, ctx); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, sink, info, ctx); osync_assert(sink); osync_assert(ctx); @@ -272,16 +272,16 @@ } else if (!functions.get_changes) { osync_context_report_success(ctx); } else { - functions.get_changes(sink, info, ctx, osync_objtype_sink_get_slowsync(sink), plugindata); + functions.get_changes(sink, info, ctx, osync_objtype_sink_get_slowsync(sink), osync_objtype_sink_get_userdata(sink)); } osync_trace(TRACE_EXIT, "%s", __func__); } -void osync_objtype_sink_read_change(OSyncObjTypeSink *sink, void *plugindata, OSyncPluginInfo *info, OSyncChange *change, OSyncContext *ctx) +void osync_objtype_sink_read_change(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncChange *change, OSyncContext *ctx) { OSyncObjTypeSinkFunctions functions; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, sink, plugindata, info, change, ctx); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, sink, info, change, ctx); osync_assert(sink); osync_assert(ctx); osync_assert(change); @@ -296,16 +296,16 @@ } else if (!functions.read) { osync_context_report_success(ctx); } else { - functions.read(sink, info, ctx, change, plugindata); + functions.read(sink, info, ctx, change, osync_objtype_sink_get_userdata(sink)); } osync_trace(TRACE_EXIT, "%s", __func__); } -void osync_objtype_sink_connect(OSyncObjTypeSink *sink, void *plugindata, OSyncPluginInfo *info, OSyncContext *ctx) +void osync_objtype_sink_connect(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx) { OSyncObjTypeSinkFunctions functions; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, sink, plugindata, info, ctx); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, sink, info, ctx); osync_assert(sink); osync_assert(ctx); @@ -313,16 +313,16 @@ if (!functions.connect) { osync_context_report_success(ctx); } else { - functions.connect(sink, info, ctx, plugindata); + functions.connect(sink, info, ctx, osync_objtype_sink_get_userdata(sink)); } osync_trace(TRACE_EXIT, "%s", __func__); } -void osync_objtype_sink_disconnect(OSyncObjTypeSink *sink, void *plugindata, OSyncPluginInfo *info, OSyncContext *ctx) +void osync_objtype_sink_disconnect(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx) { OSyncObjTypeSinkFunctions functions; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, sink, plugindata, info, ctx); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, sink, info, ctx); osync_assert(sink); osync_assert(ctx); @@ -330,16 +330,16 @@ if (!functions.disconnect) { osync_context_report_success(ctx); } else { - functions.disconnect(sink, info, ctx, plugindata); + functions.disconnect(sink, info, ctx, osync_objtype_sink_get_userdata(sink)); } osync_trace(TRACE_EXIT, "%s", __func__); } -void osync_objtype_sink_sync_done(OSyncObjTypeSink *sink, void *plugindata, OSyncPluginInfo *info, OSyncContext *ctx) +void osync_objtype_sink_sync_done(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx) { OSyncObjTypeSinkFunctions functions; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, sink, plugindata, info, ctx); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, sink, info, ctx); osync_assert(sink); osync_assert(ctx); @@ -347,15 +347,15 @@ if (!functions.sync_done) osync_context_report_success(ctx); else - functions.sync_done(sink, info, ctx, plugindata); + functions.sync_done(sink, info, ctx, osync_objtype_sink_get_userdata(sink)); osync_trace(TRACE_EXIT, "%s", __func__); } -void osync_objtype_sink_connect_done(OSyncObjTypeSink *sink, void *plugindata, OSyncPluginInfo *info, OSyncContext *ctx) +void osync_objtype_sink_connect_done(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx) { OSyncObjTypeSinkFunctions functions; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, sink, plugindata, info, ctx); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, sink, info, ctx); osync_assert(sink); osync_assert(ctx); @@ -363,15 +363,15 @@ if (!functions.connect_done) osync_context_report_success(ctx); else - functions.connect_done(sink, info, ctx, plugindata); + functions.connect_done(sink, info, ctx, osync_objtype_sink_get_userdata(sink)); osync_trace(TRACE_EXIT, "%s", __func__); } -void osync_objtype_sink_commit_change(OSyncObjTypeSink *sink, void *plugindata, OSyncPluginInfo *info, OSyncChange *change, OSyncContext *ctx) +void osync_objtype_sink_commit_change(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncChange *change, OSyncContext *ctx) { OSyncObjTypeSinkFunctions functions; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, sink, plugindata, info, change, ctx); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, sink, info, change, ctx); g_assert(sink); g_assert(change); g_assert(ctx); @@ -398,14 +398,14 @@ } else if (!functions.commit) { osync_context_report_success(ctx); } else { - functions.commit(sink, info, ctx, change, plugindata); + functions.commit(sink, info, ctx, change, osync_objtype_sink_get_userdata(sink)); } } osync_trace(TRACE_EXIT, "%s", __func__); } -void osync_objtype_sink_committed_all(OSyncObjTypeSink *sink, void *plugindata, OSyncPluginInfo *info, OSyncContext *ctx) +void osync_objtype_sink_committed_all(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx) { OSyncObjTypeSinkFunctions functions; int i = 0; @@ -415,7 +415,7 @@ OSyncChange *change = NULL; OSyncContext *context = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, sink, plugindata, info, ctx); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, sink, info, ctx); osync_assert(sink); osync_assert(ctx); @@ -444,12 +444,12 @@ osync_list_free(sink->commit_changes); osync_list_free(sink->commit_contexts); - functions.batch_commit(sink, info, ctx, contexts, changes, plugindata); + functions.batch_commit(sink, info, ctx, contexts, changes, osync_objtype_sink_get_userdata(sink)); osync_free(changes); osync_free(contexts); } else if (functions.committed_all) { - functions.committed_all(sink, info, ctx, plugindata); + functions.committed_all(sink, info, ctx, osync_objtype_sink_get_userdata(sink)); } else { osync_context_report_success(ctx); } Modified: trunk/opensync/plugin/opensync_objtype_sink.h ============================================================================== --- trunk/opensync/plugin/opensync_objtype_sink.h Thu Mar 26 04:20:31 2009 (r5348) +++ trunk/opensync/plugin/opensync_objtype_sink.h Thu Mar 26 14:25:12 2009 (r5349) @@ -358,86 +358,79 @@ * Calls the get_changes function on a sink * * @param sink Pointer to the sink - * @param plugindata User data that will be passed on to the callback function * @param info Pointer to the plugin info object * @param ctx The sync context * */ -OSYNC_EXPORT void osync_objtype_sink_get_changes(OSyncObjTypeSink *sink, void *plugindata, OSyncPluginInfo *info, OSyncContext *ctx); +OSYNC_EXPORT void osync_objtype_sink_get_changes(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx); /** @brief Reads a single object by its uid * * Calls the read_change function on the sink * * @param sink Pointer to the sink - * @param plugindata User data that will be passed on to the callback function * @param info Pointer to the plugin info object * @param change The change to read. The change must have the uid set * @param ctx The sync context * */ -OSYNC_EXPORT void osync_objtype_sink_read_change(OSyncObjTypeSink *sink, void *plugindata, OSyncPluginInfo *info, OSyncChange *change, OSyncContext *ctx); +OSYNC_EXPORT void osync_objtype_sink_read_change(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncChange *change, OSyncContext *ctx); /** @brief Connects a sink to its device * * Calls the connect function on a sink * * @param sink Pointer to the sink - * @param plugindata User data that will be passed on to the callback function * @param info Pointer to the plugin info object * @param ctx The sync context * */ -OSYNC_EXPORT void osync_objtype_sink_connect(OSyncObjTypeSink *sink, void *plugindata, OSyncPluginInfo *info, OSyncContext *ctx); +OSYNC_EXPORT void osync_objtype_sink_connect(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx); /** @brief Disconnects a sink from its device * * Calls the disconnect function on a sink * * @param sink Pointer to the sink - * @param plugindata User data that will be passed on to the callback function * @param info Pointer to the plugin info object * @param ctx The sync context * */ -OSYNC_EXPORT void osync_objtype_sink_disconnect(OSyncObjTypeSink *sink, void *plugindata, OSyncPluginInfo *info, OSyncContext *ctx); +OSYNC_EXPORT void osync_objtype_sink_disconnect(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx); /** @brief Tells the sink that the sync was successfully completed * * Calls the sync_done function on a sink * * @param sink Pointer to the sink - * @param plugindata User data that will be passed on to the callback function * @param info Pointer to the plugin info object * @param ctx The sync context * */ -OSYNC_EXPORT void osync_objtype_sink_sync_done(OSyncObjTypeSink *sink, void *plugindata, OSyncPluginInfo *info, OSyncContext *ctx); +OSYNC_EXPORT void osync_objtype_sink_sync_done(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx); /** @brief Tells the sink that the connection was successfully completed * * Calls the connect_done function on a sink * * @param sink Pointer to the sink - * @param plugindata User data that will be passed on to the callback function * @param info Pointer to the plugin info object * @param ctx The sync context * */ -OSYNC_EXPORT void osync_objtype_sink_connect_done(OSyncObjTypeSink *sink, void *plugindata, OSyncPluginInfo *info, OSyncContext *ctx); +OSYNC_EXPORT void osync_objtype_sink_connect_done(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx); /** @brief Commits a change to the device * * Calls the commit_change function on a sink * * @param sink Pointer to the sink - * @param plugindata User data that will be passed on to the callback function * @param info Pointer to the plugin info object * @param change The change to write * @param ctx The sync context * */ -OSYNC_EXPORT void osync_objtype_sink_commit_change(OSyncObjTypeSink *sink, void *plugindata, OSyncPluginInfo *info, OSyncChange *change, OSyncContext *ctx); +OSYNC_EXPORT void osync_objtype_sink_commit_change(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncChange *change, OSyncContext *ctx); /** @brief Tells the sink that all changes have been committed * @@ -445,12 +438,11 @@ * depending on which function the sink wants to use. * * @param sink Pointer to the sink - * @param plugindata User data that will be passed on to the callback function * @param info Pointer to the plugin info object * @param ctx The sync context * */ -OSYNC_EXPORT void osync_objtype_sink_committed_all(OSyncObjTypeSink *sink, void *plugindata, OSyncPluginInfo *info, OSyncContext *ctx); +OSYNC_EXPORT void osync_objtype_sink_committed_all(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx); /** @brief Sets the connect timeout in seconds for the OSyncObjTypeSink Modified: trunk/tools/osyncplugin.c ============================================================================== --- trunk/tools/osyncplugin.c Thu Mar 26 04:20:31 2009 (r5348) +++ trunk/tools/osyncplugin.c Thu Mar 26 14:25:12 2009 (r5349) @@ -35,7 +35,6 @@ #include <opensync/opensync-plugin.h> #include <opensync/opensync-format.h> - #include <opensync/opensync-context.h> char *pluginpath = NULL; @@ -558,7 +557,7 @@ } -static osync_bool get_changes_sink(Command *cmd, OSyncObjTypeSink *sink, SyncType type, void *plugin_data, OSyncError **error) +static osync_bool get_changes_sink(Command *cmd, OSyncObjTypeSink *sink, SyncType type, OSyncError **error) { OSyncContext *context = NULL; assert(sink); @@ -583,7 +582,7 @@ osync_plugin_info_set_sink(plugin_info, sink); - osync_objtype_sink_get_changes(sink, plugin_data, plugin_info, context); + osync_objtype_sink_get_changes(sink, plugin_info, context); osync_context_unref(context); @@ -594,7 +593,7 @@ return FALSE; } -static osync_bool get_changes(Command *cmd, SyncType type, void *plugin_data, OSyncError **error) +static osync_bool get_changes(Command *cmd, SyncType type, OSyncError **error) { int num, i; OSyncObjTypeSink *sink = NULL; @@ -606,7 +605,7 @@ goto error; cmd->sink = sink; - if (!get_changes_sink(cmd, sink, type, plugin_data, error)) + if (!get_changes_sink(cmd, sink, type, error)) goto error; } else { @@ -616,14 +615,14 @@ sink = osync_plugin_info_nth_objtype(plugin_info, i); cmd->sink = sink; - if (!get_changes_sink(cmd, sink, type, plugin_data, error)) + if (!get_changes_sink(cmd, sink, type, error)) goto error; } /* last but not least - the main sink */ if (get_main_sink()) - if (!get_changes_sink(cmd, get_main_sink(), type, plugin_data, error)) + if (!get_changes_sink(cmd, get_main_sink(), type, error)) goto error; } @@ -668,7 +667,7 @@ return; } -static osync_bool connect_sink(Command *cmd, OSyncObjTypeSink *sink, void *plugin_data, OSyncError **error) { +static osync_bool connect_sink(Command *cmd, OSyncObjTypeSink *sink, OSyncError **error) { OSyncContext *context = NULL; assert(sink); assert(cmd); @@ -683,7 +682,7 @@ osync_plugin_info_set_sink(plugin_info, sink); - osync_objtype_sink_connect(sink, plugin_data, plugin_info, context); + osync_objtype_sink_connect(sink, plugin_info, context); osync_context_unref(context); @@ -693,7 +692,7 @@ return FALSE; } -static osync_bool connect_plugin(Command *cmd, void *plugin_data, OSyncError **error) +static osync_bool connect_plugin(Command *cmd, OSyncError **error) { unsigned int i, num; OSyncObjTypeSink *sink = NULL; @@ -704,20 +703,20 @@ if (!sink) goto error; - if (!connect_sink(cmd, sink, plugin_data, error)) + if (!connect_sink(cmd, sink, error)) goto error; } else { num = osync_plugin_info_num_objtypes(plugin_info); for (i=0; i < num; i++) { sink = osync_plugin_info_nth_objtype(plugin_info, i); - if (!connect_sink(cmd, sink, plugin_data, error)) + if (!connect_sink(cmd, sink, error)) goto error; } /* last but not least - the main sink */ if (get_main_sink()) - if (!connect_sink(cmd, get_main_sink(), plugin_data, error)) + if (!connect_sink(cmd, get_main_sink(), error)) goto error; } @@ -760,7 +759,7 @@ return; } -static osync_bool disconnect_sink(Command *cmd, OSyncObjTypeSink *sink, void *plugin_data, OSyncError **error) { +static osync_bool disconnect_sink(Command *cmd, OSyncObjTypeSink *sink, OSyncError **error) { OSyncContext *context = osync_context_new(error); assert(sink); assert(cmd); @@ -774,7 +773,7 @@ osync_plugin_info_set_sink(plugin_info, sink); - osync_objtype_sink_disconnect(sink, plugin_data, plugin_info, context); + osync_objtype_sink_disconnect(sink, plugin_info, context); osync_context_unref(context); @@ -784,7 +783,7 @@ return FALSE; } -static osync_bool disconnect(Command *cmd, void *plugin_data, OSyncError **error) +static osync_bool disconnect(Command *cmd, OSyncError **error) { int i, num; @@ -796,20 +795,20 @@ if (!sink) goto error; - if (!disconnect_sink(cmd, sink, plugin_data, error)) + if (!disconnect_sink(cmd, sink, error)) goto error; } else { num = osync_plugin_info_num_objtypes(plugin_info); for (i=0; i < num; i++) { sink = osync_plugin_info_nth_objtype(plugin_info, i); - if (!disconnect_sink(cmd, sink, plugin_data, error)) + if (!disconnect_sink(cmd, sink, error)) goto error; } /* last but not least - the main sink */ if (get_main_sink()) - if (!disconnect_sink(cmd, get_main_sink(), plugin_data, error)) + if (!disconnect_sink(cmd, get_main_sink(), error)) goto error; } @@ -846,7 +845,7 @@ } -static osync_bool commit_sink(Command *cmd, OSyncObjTypeSink *sink, OSyncChange *change, void *plugin_data, OSyncError **error) { +static osync_bool commit_sink(Command *cmd, OSyncObjTypeSink *sink, OSyncChange *change, OSyncError **error) { OSyncContext *context = NULL; assert(sink); assert(change); @@ -866,7 +865,7 @@ osync_data_get_objtype(osync_change_get_data(change)), osync_change_get_uid(change)); - osync_objtype_sink_commit_change(sink, plugin_data, plugin_info, change, context); + osync_objtype_sink_commit_change(sink, plugin_info, change, context); osync_context_unref(context); @@ -876,7 +875,7 @@ return FALSE; } -static osync_bool commit(Command *cmd, OSyncChange *change, void *plugin_data, OSyncError **error) +static osync_bool commit(Command *cmd, OSyncChange *change, OSyncError **error) { int i, num; OSyncObjTypeSink *sink = NULL; @@ -889,20 +888,20 @@ if (!sink) goto error; - if (!commit_sink(cmd, sink, change, plugin_data, error)) + if (!commit_sink(cmd, sink, change, error)) goto error; } else { num = osync_plugin_info_num_objtypes(plugin_info); for (i=0; i < num; i++) { sink = osync_plugin_info_nth_objtype(plugin_info, i); - if (!commit_sink(cmd, sink, change, plugin_data, error)) + if (!commit_sink(cmd, sink, change, error)) goto error; } /* last but not least - the main sink */ if (get_main_sink()) - if (!commit_sink(cmd, get_main_sink(), change, plugin_data, error)) + if (!commit_sink(cmd, get_main_sink(), change, error)) goto error; } @@ -911,14 +910,14 @@ return FALSE; } -static osync_bool empty(Command *cmd, void *plugin_data, OSyncError **error) +static osync_bool empty(Command *cmd, OSyncError **error) { int i; GList *c; //const char *objtype = cmd->arg; /* Perform slowync - if objtype is set for this objtype, otherwise slowsync for ALL */ - if (!get_changes(cmd, SYNCTYPE_FORCE_SLOWSYNC, plugin_data, error)) + if (!get_changes(cmd, SYNCTYPE_FORCE_SLOWSYNC, error)) goto error; @@ -926,7 +925,7 @@ OSyncChange *change = c->data; osync_change_set_changetype(change, OSYNC_CHANGE_TYPE_DELETED); - if (!commit(cmd, change, plugin_data, error)) + if (!commit(cmd, change, error)) goto error; } @@ -963,7 +962,7 @@ return; } -static osync_bool syncdone_sink(Command *cmd, OSyncObjTypeSink *sink, void *plugin_data, OSyncError **error) { +static osync_bool syncdone_sink(Command *cmd, OSyncObjTypeSink *sink, OSyncError **error) { OSyncContext *context = NULL; assert(sink); assert(cmd); @@ -978,7 +977,7 @@ osync_plugin_info_set_sink(plugin_info, sink); - osync_objtype_sink_sync_done(sink, plugin_data, plugin_info, context); + osync_objtype_sink_sync_done(sink, plugin_info, context); osync_context_unref(context); @@ -988,7 +987,7 @@ return FALSE; } -static osync_bool syncdone(Command *cmd, void *plugin_data, OSyncError **error) +static osync_bool syncdone(Command *cmd, OSyncError **error) { int i, num; @@ -1000,20 +999,20 @@ if (!sink) goto error; - if (!syncdone_sink(cmd, sink, plugin_data, error)) + if (!syncdone_sink(cmd, sink, error)) goto error; } else { num = osync_plugin_info_num_objtypes(plugin_info); for (i=0; i < num; i++) { sink = osync_plugin_info_nth_objtype(plugin_info, i); - if (!syncdone_sink(cmd, sink, plugin_data, error)) + if (!syncdone_sink(cmd, sink, error)) goto error; } /* last but not least - the main sink */ if (get_main_sink()) - if (!syncdone_sink(cmd, get_main_sink(), plugin_data, error)) + if (!syncdone_sink(cmd, get_main_sink(), error)) goto error; } @@ -1047,7 +1046,7 @@ return; } -static osync_bool committedall_sink(Command *cmd, OSyncObjTypeSink *sink, void *plugin_data, OSyncError **error) { +static osync_bool committedall_sink(Command *cmd, OSyncObjTypeSink *sink, OSyncError **error) { OSyncContext *context = NULL; assert(sink); assert(cmd); @@ -1062,7 +1061,7 @@ osync_plugin_info_set_sink(plugin_info, sink); - osync_objtype_sink_committed_all(sink, plugin_data, plugin_info, context); + osync_objtype_sink_committed_all(sink, plugin_info, context); osync_context_unref(context); @@ -1072,7 +1071,7 @@ return FALSE; } -static osync_bool committedall(Command *cmd, void *plugin_data, OSyncError **error) +static osync_bool committedall(Command *cmd, OSyncError **error) { int i, num; OSyncObjTypeSink *sink = NULL; @@ -1083,20 +1082,20 @@ if (!sink) goto error; - if (!committedall_sink(cmd, sink, plugin_data, error)) + if (!committedall_sink(cmd, sink, error)) goto error; } else { num = osync_plugin_info_num_objtypes(plugin_info); for (i=0; i < num; i++) { sink = osync_plugin_info_nth_objtype(plugin_info, i); - if (!committedall_sink(cmd, sink, plugin_data, error)) + if (!committedall_sink(cmd, sink, error)) goto error; } /* last but not least - the main sink */ if (get_main_sink()) - if (!committedall_sink(cmd, get_main_sink(), plugin_data, error)) + if (!committedall_sink(cmd, get_main_sink(), error)) goto error; } @@ -1120,7 +1119,7 @@ switch (cmd->cmd) { case CMD_EMPTY: - if (!empty(cmd, *plugin_data, error)) + if (!empty(cmd, error)) goto error; break; case CMD_INITIALIZE: @@ -1131,23 +1130,23 @@ finalize_plugin(plugin_data); break; case CMD_CONNECT: - if (!connect_plugin(cmd, *plugin_data, error)) + if (!connect_plugin(cmd, error)) goto error; break; case CMD_DISCONNECT: - if (!disconnect(cmd, *plugin_data, error)) + if (!disconnect(cmd, error)) goto error; break; case CMD_SLOWSYNC: - if (!get_changes(cmd, SYNCTYPE_FORCE_SLOWSYNC, *plugin_data, error)) + if (!get_changes(cmd, SYNCTYPE_FORCE_SLOWSYNC, error)) goto error; break; case CMD_FASTSYNC: - if (!get_changes(cmd, SYNCTYPE_FORCE_FASTSYNC, *plugin_data, error)) + if (!get_changes(cmd, SYNCTYPE_FORCE_FASTSYNC, error)) goto error; break; case CMD_SYNC: - if (!get_changes(cmd, SYNCTYPE_NORMAL, *plugin_data, error)) + if (!get_changes(cmd, SYNCTYPE_NORMAL, error)) goto error; break; case CMD_COMMIT: @@ -1157,7 +1156,7 @@ fprintf(stderr, "BATCHCOMMIT not yet implemented\n"); break; case CMD_COMMITTEDALL: - if (!committedall(cmd, *plugin_data, error)) + if (!committedall(cmd, error)) goto error; break; case CMD_READ: @@ -1167,7 +1166,7 @@ fprintf(stderr, "WRITE not yet implemented\n"); break; case CMD_SYNCDONE: - if (!syncdone(cmd, *plugin_data, error)) + if (!syncdone(cmd, error)) goto error; break; case CMD_DISCOVER: @@ -1287,7 +1286,7 @@ error_disconnect_and_finalize: if (plugin_data) - disconnect(NULL, plugin_data, NULL); + disconnect(NULL, NULL); //error_finalize: finalize_plugin(&plugin_data); //error_free_plugin_env: |
