Menu
▾
▴
[Opensync-commits] r5051 - plugins/syncml/src
|
From: <dg...@su...> - 2009-01-08 08:09:44
|
Author: bricks Date: Thu Jan 8 09:09:09 2009 New Revision: 5051 URL: http://www.opensync.org/changeset/5051 Log: Changed order of the discovery function parameters (syncml plugin doesn't compile currently due to anchor api changes) Modified: plugins/syncml/src/syncml_http_client.c plugins/syncml/src/syncml_http_client.h plugins/syncml/src/syncml_http_server.c plugins/syncml/src/syncml_http_server.h plugins/syncml/src/syncml_obex_client.c plugins/syncml/src/syncml_obex_client.h plugins/syncml/src/syncml_plugin.c Modified: plugins/syncml/src/syncml_http_client.c ============================================================================== --- plugins/syncml/src/syncml_http_client.c Wed Jan 7 22:16:33 2009 (r5050) +++ plugins/syncml/src/syncml_http_client.c Thu Jan 8 09:09:09 2009 (r5051) @@ -62,7 +62,7 @@ return NULL; } -osync_bool syncml_http_client_discover(void *data, OSyncPluginInfo *info, OSyncError **error) +osync_bool syncml_http_client_discover(OSyncPluginInfo *info, void *data, OSyncError **error) { return discover("syncml-http-client", data, info, error); } Modified: plugins/syncml/src/syncml_http_client.h ============================================================================== --- plugins/syncml/src/syncml_http_client.h Wed Jan 7 22:16:33 2009 (r5050) +++ plugins/syncml/src/syncml_http_client.h Thu Jan 8 09:09:09 2009 (r5051) @@ -8,7 +8,8 @@ OSyncError **error); osync_bool syncml_http_client_discover( - void *data, OSyncPluginInfo *info, + OSyncPluginInfo *info, + void *data, OSyncError **error); #endif //_SYNCML_PLUGIN_HTTP_CLIENT_H Modified: plugins/syncml/src/syncml_http_server.c ============================================================================== --- plugins/syncml/src/syncml_http_server.c Wed Jan 7 22:16:33 2009 (r5050) +++ plugins/syncml/src/syncml_http_server.c Thu Jan 8 09:09:09 2009 (r5051) @@ -38,7 +38,7 @@ return NULL; } -osync_bool syncml_http_server_discover(void *data, OSyncPluginInfo *info, OSyncError **error) +osync_bool syncml_http_server_discover(OSyncPluginInfo *info, void *data, OSyncError **error) { return discover("syncml-http-server", data, info, error); } Modified: plugins/syncml/src/syncml_http_server.h ============================================================================== --- plugins/syncml/src/syncml_http_server.h Wed Jan 7 22:16:33 2009 (r5050) +++ plugins/syncml/src/syncml_http_server.h Thu Jan 8 09:09:09 2009 (r5051) @@ -8,7 +8,8 @@ OSyncError **error); osync_bool syncml_http_server_discover( - void *data, OSyncPluginInfo *info, + OSyncPluginInfo *info, + void *data, OSyncError **error); #endif //_SYNCML_PLUGIN_HTTP_SERVER_H Modified: plugins/syncml/src/syncml_obex_client.c ============================================================================== --- plugins/syncml/src/syncml_obex_client.c Wed Jan 7 22:16:33 2009 (r5050) +++ plugins/syncml/src/syncml_obex_client.c Thu Jan 8 09:09:09 2009 (r5051) @@ -59,7 +59,7 @@ return NULL; } -osync_bool syncml_obex_client_discover(void *data, OSyncPluginInfo *info, OSyncError **error) +osync_bool syncml_obex_client_discover(OSyncPluginInfo *info, void *data, OSyncError **error) { return discover("syncml-obex-client", data, info, error); } Modified: plugins/syncml/src/syncml_obex_client.h ============================================================================== --- plugins/syncml/src/syncml_obex_client.h Wed Jan 7 22:16:33 2009 (r5050) +++ plugins/syncml/src/syncml_obex_client.h Thu Jan 8 09:09:09 2009 (r5051) @@ -8,7 +8,8 @@ OSyncError **error); osync_bool syncml_obex_client_discover( - void *data, OSyncPluginInfo *info, + OSyncPluginInfo *info, + void *data, OSyncError **error); #endif //_SYNCML_PLUGIN_OBEX_CLIENT_H Modified: plugins/syncml/src/syncml_plugin.c ============================================================================== --- plugins/syncml/src/syncml_plugin.c Wed Jan 7 22:16:33 2009 (r5050) +++ plugins/syncml/src/syncml_plugin.c Thu Jan 8 09:09:09 2009 (r5051) @@ -33,67 +33,67 @@ osync_bool get_sync_info(OSyncPluginEnv *env, OSyncError **error) { - OSyncPlugin *plugin; + OSyncPlugin *plugin; #ifdef ENABLE_HTTP - plugin = osync_plugin_new(error); + plugin = osync_plugin_new(error); - if (!plugin) - goto error; + if (!plugin) + goto error; - osync_plugin_set_name(plugin, "syncml-http-server"); - osync_plugin_set_longname(plugin, "SyncML over HTTP Server"); - osync_plugin_set_description(plugin, "Plugin to synchronize with SyncML over HTTP"); + osync_plugin_set_name(plugin, "syncml-http-server"); + osync_plugin_set_longname(plugin, "SyncML over HTTP Server"); + osync_plugin_set_description(plugin, "Plugin to synchronize with SyncML over HTTP"); - osync_plugin_set_initialize(plugin, syncml_http_server_init); - osync_plugin_set_finalize(plugin, finalize); - osync_plugin_set_discover(plugin, syncml_http_server_discover); + osync_plugin_set_initialize(plugin, syncml_http_server_init); + osync_plugin_set_finalize(plugin, finalize); + osync_plugin_set_discover(plugin, syncml_http_server_discover); - osync_plugin_env_register_plugin(env, plugin); - osync_plugin_unref(plugin); + osync_plugin_env_register_plugin(env, plugin); + osync_plugin_unref(plugin); - plugin = osync_plugin_new(error); + plugin = osync_plugin_new(error); - if (!plugin) - goto error; + if (!plugin) + goto error; - osync_plugin_set_name(plugin, "syncml-http-client"); - osync_plugin_set_longname(plugin, "SyncML over HTTP Client"); - osync_plugin_set_description(plugin, "Plugin to synchronize with SyncML over HTTP"); + osync_plugin_set_name(plugin, "syncml-http-client"); + osync_plugin_set_longname(plugin, "SyncML over HTTP Client"); + osync_plugin_set_description(plugin, "Plugin to synchronize with SyncML over HTTP"); - osync_plugin_set_initialize(plugin, syncml_http_client_init); - osync_plugin_set_finalize(plugin, finalize); - osync_plugin_set_discover(plugin, syncml_http_client_discover); + osync_plugin_set_initialize(plugin, syncml_http_client_init); + osync_plugin_set_finalize(plugin, finalize); + osync_plugin_set_discover(plugin, syncml_http_client_discover); - osync_plugin_env_register_plugin(env, plugin); - osync_plugin_unref(plugin); + osync_plugin_env_register_plugin(env, plugin); + osync_plugin_unref(plugin); #endif #ifdef ENABLE_OBEX - plugin = osync_plugin_new(error); - if (!plugin) - goto error; - - osync_plugin_set_name(plugin, "syncml-obex-client"); - osync_plugin_set_longname(plugin, "SyncML over OBEX Client"); - osync_plugin_set_description(plugin, "Plugin to synchronize with SyncML over OBEX"); - - osync_plugin_set_initialize(plugin, syncml_obex_client_init); - osync_plugin_set_finalize(plugin, finalize); - osync_plugin_set_discover(plugin, syncml_obex_client_discover); + plugin = osync_plugin_new(error); + if (!plugin) + goto error; + + osync_plugin_set_name(plugin, "syncml-obex-client"); + osync_plugin_set_longname(plugin, "SyncML over OBEX Client"); + osync_plugin_set_description(plugin, "Plugin to synchronize with SyncML over OBEX"); + + osync_plugin_set_initialize(plugin, syncml_obex_client_init); + osync_plugin_set_finalize(plugin, finalize); + osync_plugin_set_discover(plugin, syncml_obex_client_discover); - osync_plugin_env_register_plugin(env, plugin); - osync_plugin_unref(plugin); + osync_plugin_env_register_plugin(env, plugin); + osync_plugin_unref(plugin); - return TRUE; + return TRUE; #endif error: - osync_trace(TRACE_ERROR, "Unable to register: %s", osync_error_print(error)); - return FALSE; + osync_trace(TRACE_ERROR, "Unable to register: %s", osync_error_print(error)); + return FALSE; } int get_version(void) { - return 1; + return 1; } |
