Menu
▾
▴
[Opensync-commits] r5067 - in trunk: . docs/examples/plugins docs/examples/plugins/src opensync opensync/capabilities opensync/client opensync/common opensync/engine opensync/format opensync/group opensync/helper opensync/ipc opensync/plugin opensync/version opensync/xmlformat tests/capabilities-tests tests/data/capabilities wrapper
|
From: <dg...@su...> - 2009-01-10 16:16:51
|
Author: bricks Date: Sat Jan 10 17:16:11 2009 New Revision: 5067 URL: http://www.opensync.org/changeset/5067 Log: reverted r5049 because it passed the wrong data to the plugin discovery function Modified: trunk/docs/examples/plugins/ (props changed) trunk/docs/examples/plugins/src/simple_plugin.c (props changed) trunk/libopensync.pc.in (props changed) trunk/opensync/capabilities/ (props changed) trunk/opensync/capabilities/opensync-capabilities_internals.h (props changed) trunk/opensync/capabilities/opensync_capability_private.h (props changed) trunk/opensync/client/opensync_client.c trunk/opensync/common/opensync_error.c (props changed) trunk/opensync/common/opensync_error.h (props changed) trunk/opensync/common/opensync_error_private.h (props changed) trunk/opensync/common/opensync_list.c (props changed) trunk/opensync/common/opensync_list.h (props changed) trunk/opensync/common/opensync_marshal.c (props changed) trunk/opensync/common/opensync_marshal_private.h (props changed) trunk/opensync/common/opensync_xml.c (props changed) trunk/opensync/common/opensync_xml_internals.h (props changed) trunk/opensync/engine/opensync_engine_private.h (props changed) trunk/opensync/engine/opensync_status_internals.h (props changed) trunk/opensync/format/opensync_objformat_private.h (props changed) trunk/opensync/format/opensync_objformat_sink_private.h (props changed) trunk/opensync/group/opensync_updater_private.h (props changed) trunk/opensync/helper/opensync_anchor_internals.h (props changed) trunk/opensync/ipc/opensync_message_internals.h (props changed) trunk/opensync/ipc/opensync_message_private.h (props changed) trunk/opensync/ipc/opensync_queue_private.h (props changed) trunk/opensync/opensync-capabilities.h (props changed) trunk/opensync/plugin/opensync_context.c (props changed) trunk/opensync/plugin/opensync_context.h (props changed) trunk/opensync/plugin/opensync_context_private.h (props changed) trunk/opensync/plugin/opensync_objtype_sink.c (props changed) trunk/opensync/plugin/opensync_objtype_sink.h (props changed) trunk/opensync/plugin/opensync_objtype_sink_private.h (props changed) trunk/opensync/plugin/opensync_plugin.c trunk/opensync/plugin/opensync_plugin.h trunk/opensync/plugin/opensync_plugin_advancedoptions_private.h (props changed) trunk/opensync/plugin/opensync_plugin_authentication_private.h (props changed) trunk/opensync/plugin/opensync_plugin_config_private.h (props changed) trunk/opensync/plugin/opensync_plugin_connection_private.h (props changed) trunk/opensync/plugin/opensync_plugin_env_private.h (props changed) trunk/opensync/plugin/opensync_plugin_info_private.h (props changed) trunk/opensync/plugin/opensync_plugin_localization_private.h (props changed) trunk/opensync/plugin/opensync_plugin_private.h (props changed) trunk/opensync/plugin/opensync_plugin_resource.c (props changed) trunk/opensync/plugin/opensync_plugin_resource.h (props changed) trunk/opensync/plugin/opensync_plugin_resource_private.h (props changed) trunk/opensync/version/opensync_version_private.h (props changed) trunk/opensync/xmlformat/opensync_xmlfield.c (props changed) trunk/opensync/xmlformat/opensync_xmlfield.h (props changed) trunk/opensync/xmlformat/opensync_xmlfield_internals.h (props changed) trunk/opensync/xmlformat/opensync_xmlfield_private.h (props changed) trunk/opensync/xmlformat/opensync_xmlfieldlist.c (props changed) trunk/opensync/xmlformat/opensync_xmlfieldlist.h (props changed) trunk/opensync/xmlformat/opensync_xmlfieldlist_internals.h (props changed) trunk/opensync/xmlformat/opensync_xmlfieldlist_private.h (props changed) trunk/opensync/xmlformat/opensync_xmlformat.c (props changed) trunk/opensync/xmlformat/opensync_xmlformat.h (props changed) trunk/opensync/xmlformat/opensync_xmlformat_internals.h (props changed) trunk/opensync/xmlformat/opensync_xmlformat_private.h (props changed) trunk/opensync/xmlformat/opensync_xmlformat_schema_private.h (props changed) trunk/tests/capabilities-tests/ (props changed) trunk/tests/data/capabilities/ (props changed) trunk/wrapper/opensync-plugin.i Modified: trunk/opensync/client/opensync_client.c ============================================================================== --- trunk/opensync/client/opensync_client.c Sat Jan 10 15:01:54 2009 (r5066) +++ trunk/opensync/client/opensync_client.c Sat Jan 10 17:16:11 2009 (r5067) @@ -837,7 +837,7 @@ osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, client, message, error); - if (!osync_plugin_discover(client->plugin, client->plugin_info, error)) + if (!osync_plugin_discover(client->plugin, client->plugin_data, client->plugin_info, error)) goto error; reply = osync_message_new_reply(message, error); Modified: trunk/opensync/plugin/opensync_plugin.c ============================================================================== --- trunk/opensync/plugin/opensync_plugin.c Sat Jan 10 15:01:54 2009 (r5066) +++ trunk/opensync/plugin/opensync_plugin.c Sat Jan 10 17:16:11 2009 (r5067) @@ -179,13 +179,13 @@ plugin->finalize(data); } -osync_bool osync_plugin_discover(OSyncPlugin *plugin, OSyncPluginInfo *info, OSyncError **error) +osync_bool osync_plugin_discover(OSyncPlugin *plugin, void *data, OSyncPluginInfo *info, OSyncError **error) { osync_assert(plugin); if (!plugin->discover) return TRUE; - return plugin->discover(info, plugin->plugin_data, error); + return plugin->discover(info, data, error); } osync_bool osync_plugin_is_usable(OSyncPlugin *plugin, OSyncError **error) Modified: trunk/opensync/plugin/opensync_plugin.h ============================================================================== --- trunk/opensync/plugin/opensync_plugin.h Sat Jan 10 15:01:54 2009 (r5066) +++ trunk/opensync/plugin/opensync_plugin.h Sat Jan 10 17:16:11 2009 (r5067) @@ -282,15 +282,15 @@ */ OSYNC_EXPORT void osync_plugin_finalize(OSyncPlugin *plugin, void *data); -/** @brief Call plugin discovery. - * osync_plugin_discover passes the plugin_data to the discovery function of the plugin. +/** @brief Call plugin discovery * * @param plugin Pointer to the plugin + * @param data Pointer to userdata which got returned by plugin initialize function * @param info Pointer to OSyncPluginInfo which describes the plugin * @param error Pointer to error-struct * @return TRUE on success, FALSE otherwise */ -OSYNC_EXPORT osync_bool osync_plugin_discover(OSyncPlugin *plugin, OSyncPluginInfo *info, OSyncError **error); +OSYNC_EXPORT osync_bool osync_plugin_discover(OSyncPlugin *plugin, void *data, OSyncPluginInfo *info, OSyncError **error); /*@}*/ Modified: trunk/wrapper/opensync-plugin.i ============================================================================== --- trunk/wrapper/opensync-plugin.i Sat Jan 10 15:01:54 2009 (r5066) +++ trunk/wrapper/opensync-plugin.i Sat Jan 10 17:16:11 2009 (r5067) @@ -70,9 +70,9 @@ osync_plugin_finalize(self, data); } - void discover(PluginInfo *info, void *data) { + void discover(void *data, PluginInfo *info) { Error *err = NULL; - bool ret = osync_plugin_discover(self, info, &err); + bool ret = osync_plugin_discover(self, data, info, &err); if (!raise_exception_on_error(err) && !ret) wrapper_exception("osync_plugin_discover failed but did not set error code"); } |
