[Opensync-commits] r5280 - plugins/syncml/src

[<svn...@op...>]

Author: mkoller
Date: Sun Mar  8 14:24:30 2009
New Revision: 5280
URL: http://www.opensync.org/changeset/5280

Log:
adapt to changed Plugin-Sink Function parameter list

Modified:
   plugins/syncml/src/syncml_common.c
   plugins/syncml/src/syncml_common.h
   plugins/syncml/src/syncml_ds_client.c
   plugins/syncml/src/syncml_ds_client.h
   plugins/syncml/src/syncml_ds_server.c
   plugins/syncml/src/syncml_ds_server.h

Modified: plugins/syncml/src/syncml_common.c
==============================================================================
--- plugins/syncml/src/syncml_common.c	Mon Mar  2 14:10:56 2009	(r5279)
+++ plugins/syncml/src/syncml_common.c	Sun Mar  8 14:24:30 2009	(r5280)
@@ -193,12 +193,12 @@
 	return OSYNC_CHANGE_TYPE_UNKNOWN;
 }
 
-void connect_done(void *data, OSyncPluginInfo *info, OSyncContext *ctx)
+void connect_done(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data)
 {
 	osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx);
 
 
-        SmlDatabase *database = get_database_from_plugin_info(info);
+        SmlDatabase *database = (SmlDatabase*)data;
 
 	g_mutex_lock(database->alert_type_mutex);
 	g_cond_signal(database->alert_type_cond);
@@ -210,12 +210,12 @@
 	return;
 }
 
-void sync_done(void *data, OSyncPluginInfo *info, OSyncContext *ctx)
+void sync_done(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data)
 {
 	osync_context_report_success(ctx);
 }
 
-void disconnect(void *data, OSyncPluginInfo *info, OSyncContext *ctx)
+void disconnect(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data)
 {
 	osync_trace(TRACE_ENTRY, "%s(%p)", __func__, ctx);
 	SmlPluginEnv *env = (SmlPluginEnv *)data;
@@ -331,15 +331,6 @@
     return num;
 }
 
-SmlDatabase *get_database_from_plugin_info(OSyncPluginInfo *info)
-{
-    osync_trace(TRACE_ENTRY, "%s", __func__);
-    OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info);
-    SmlDatabase *database = osync_objtype_sink_get_userdata(sink);
-    osync_trace(TRACE_EXIT, "%s - %s", __func__, database->url);
-    return database;
-} 
-
 void safe_cfree(char **address)
 {
     safe_free((gpointer *)address);
@@ -414,7 +405,7 @@
 	return NULL;
 }
 
-void syncml_connect(void *data, OSyncPluginInfo *info, OSyncContext *ctx)
+void syncml_connect(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data)
 {
 	osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx);
 

Modified: plugins/syncml/src/syncml_common.h
==============================================================================
--- plugins/syncml/src/syncml_common.h	Mon Mar  2 14:10:56 2009	(r5279)
+++ plugins/syncml/src/syncml_common.h	Sun Mar  8 14:24:30 2009	(r5280)
@@ -156,10 +156,10 @@
 		OSyncPlugin *plugin,
 		OSyncPluginInfo *info,
 		OSyncError **oerror);
-void syncml_connect(void *data, OSyncPluginInfo *info, OSyncContext *ctx);
-void connect_done(void *data, OSyncPluginInfo *info, OSyncContext *ctx);
-void sync_done(void *data, OSyncPluginInfo *info, OSyncContext *ctx);
-void disconnect(void *data, OSyncPluginInfo *info, OSyncContext *ctx);
+void syncml_connect(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data);
+void connect_done(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data);
+void sync_done(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data);
+void disconnect(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data);
 
 osync_bool parse_config(
 		SmlTransportType tsp,
@@ -172,8 +172,6 @@
 			OSyncPluginResource *res,
 			OSyncError **error);
 
-SmlDatabase *get_database_from_plugin_info(OSyncPluginInfo *info);
-
 /* this is a helper function which adds an object to a GList */
 /* the function guarantees that an object exists only once in */
 /* this GList. No double entrees. */

Modified: plugins/syncml/src/syncml_ds_client.c
==============================================================================
--- plugins/syncml/src/syncml_ds_client.c	Mon Mar  2 14:10:56 2009	(r5279)
+++ plugins/syncml/src/syncml_ds_client.c	Sun Mar  8 14:24:30 2009	(r5280)
@@ -85,11 +85,11 @@
 	return FALSE;
 }
 
-void ds_client_get_changeinfo(void *data, OSyncPluginInfo *info, OSyncContext *ctx)
+void ds_client_get_changeinfo(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, osync_bool slow_sync, void *data)
 {
         osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx);
 
-        SmlDatabase *database = get_database_from_plugin_info(info);
+        SmlDatabase *database = (SmlDatabase*)data;
 	SmlPluginEnv *env = database->env;
 
 	if (env->state1 >= SML_DATA_SYNC_EVENT_GOT_ALL_CHANGES) {
@@ -106,14 +106,14 @@
 	return;
 }
 
-void ds_client_batch_commit(void *data, OSyncPluginInfo *info, OSyncContext *ctx, OSyncContext **contexts, OSyncChange **changes)
+void ds_client_batch_commit(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, OSyncContext **contexts, OSyncChange **changes, void *data)
 {
     osync_trace(TRACE_ENTRY, "%s", __func__);
     g_assert(ctx);
 
     SmlError  *error = NULL;
     OSyncError  *oserror = NULL;
-    SmlDatabase *database = get_database_from_plugin_info(info);
+    SmlDatabase *database = (SmlDatabase*)data;
 
     database->commitCtx = ctx;
     osync_context_ref(database->commitCtx);

Modified: plugins/syncml/src/syncml_ds_client.h
==============================================================================
--- plugins/syncml/src/syncml_ds_client.h	Mon Mar  2 14:10:56 2009	(r5279)
+++ plugins/syncml/src/syncml_ds_client.h	Sun Mar  8 14:24:30 2009	(r5280)
@@ -4,16 +4,19 @@
 #include "syncml_common.h"
 
 void ds_client_get_changeinfo(
-         void *data,
+         OSyncObjTypeSink *sink,
          OSyncPluginInfo *info,
-         OSyncContext *ctx);
+         OSyncContext *ctx,
+         osync_bool slow_sync,
+         void *data);
 
 void ds_client_batch_commit(
-         void *data,
+         OSyncObjTypeSink *sink,
          OSyncPluginInfo *info,
          OSyncContext *ctx,
          OSyncContext **contexts,
-         OSyncChange **changes);
+         OSyncChange **changes,
+         void *data);
 
 SmlBool ds_client_init_databases(
 	SmlPluginEnv *env,

Modified: plugins/syncml/src/syncml_ds_server.c
==============================================================================
--- plugins/syncml/src/syncml_ds_server.c	Mon Mar  2 14:10:56 2009	(r5279)
+++ plugins/syncml/src/syncml_ds_server.c	Sun Mar  8 14:24:30 2009	(r5280)
@@ -76,11 +76,11 @@
 	return FALSE;
 }
 
-void ds_server_get_changeinfo(void *data, OSyncPluginInfo *info, OSyncContext *ctx)
+void ds_server_get_changeinfo(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, osync_bool slow_sync, void *data)
 {
 	osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx);
 
-        SmlDatabase *database = get_database_from_plugin_info(info);
+        SmlDatabase *database = (SmlDatabase*)data;
 	SmlPluginEnv *env = database->env;
 
         database->getChangesCtx = ctx;
@@ -92,14 +92,14 @@
 	return;
 }
 
-void ds_server_batch_commit(void *data, OSyncPluginInfo *info, OSyncContext *ctx, OSyncContext **contexts, OSyncChange **changes)
+void ds_server_batch_commit(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, OSyncContext **contexts, OSyncChange **changes, void *data)
 {
     osync_trace(TRACE_ENTRY, "%s", __func__);
     g_assert(ctx);
 
     SmlError  *error = NULL;
     OSyncError  *oserror = NULL;
-    SmlDatabase *database = get_database_from_plugin_info(info);
+    SmlDatabase *database = (SmlDatabase*)data;
 
     database->env->gotDatabaseCommits++;
     database->pendingCommits = get_num_changes(changes);

Modified: plugins/syncml/src/syncml_ds_server.h
==============================================================================
--- plugins/syncml/src/syncml_ds_server.h	Mon Mar  2 14:10:56 2009	(r5279)
+++ plugins/syncml/src/syncml_ds_server.h	Sun Mar  8 14:24:30 2009	(r5280)
@@ -4,16 +4,19 @@
 #include "syncml_common.h"
 
 void ds_server_get_changeinfo(
-         void *data,
+         OSyncObjTypeSink *sink,
          OSyncPluginInfo *info,
-         OSyncContext *ctx);
+         OSyncContext *ctx,
+         osync_bool slow_sync,
+         void *data);
 
 void ds_server_batch_commit(
-         void *data,
+         OSyncObjTypeSink *sink,
          OSyncPluginInfo *info,
          OSyncContext *ctx,
          OSyncContext **contexts,
-         OSyncChange **changes);
+         OSyncChange **changes,
+         void *data);
 
 SmlBool ds_server_init_databases(
             SmlPluginEnv *env,