[Opensync-commits] r5439 - plugins/ldap-sync/src

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

Author: dgollub
Date: Mon Mar 30 00:34:37 2009
New Revision: 5439
URL: http://www.opensync.org/changeset/5439

Log:
Ported ldap-sync to OSyncObjTypeSinkFunctions API changes (r5432)

refs #1086

Modified:
   plugins/ldap-sync/src/ldap_plugin.c

Modified: plugins/ldap-sync/src/ldap_plugin.c
==============================================================================
--- plugins/ldap-sync/src/ldap_plugin.c	Mon Mar 30 00:33:10 2009	(r5438)
+++ plugins/ldap-sync/src/ldap_plugin.c	Mon Mar 30 00:34:37 2009	(r5439)
@@ -4386,16 +4386,13 @@
 
 
 	/* Every sink CAN have different functions ... */
-	OSyncObjTypeSinkFunctions functions;
-	memset(&functions, 0, sizeof(functions));
-	functions.connect = ldap_plugin_connect;
-	functions.disconnect = ldap_plugin_disconnect;
-	functions.get_changes = ldap_plugin_get_changes;
-	functions.commit = ldap_plugin_commit_change;
-	functions.sync_done = ldap_plugin_sync_done;
+	osync_objtype_sink_set_connect_func(sinkenv->sink, ldap_plugin_connect);
+	osync_objtype_sink_set_disconnect_func(sinkenv->sink, ldap_plugin_disconnect);
+	osync_objtype_sink_set_get_changes_func(sinkenv->sink, ldap_plugin_get_changes);
+	osync_objtype_sink_set_commit_func(sinkenv->sink, ldap_plugin_commit_change);
+	osync_objtype_sink_set_sync_done_func(sinkenv->sink, ldap_plugin_sync_done);
 
-
-  sinkenv->sink = osync_plugin_info_find_objtype(info, objtype);
+	sinkenv->sink = osync_plugin_info_find_objtype(info, objtype);
 	if (!sinkenv->sink) {
 		osync_trace(TRACE_INTERNAL, "%s:%i: INFO: No sink available for objtype \"%s\". Apparently, this objtype has been disabled by configuration.\n", __FILE__, __LINE__, objtype);
 		goto out;
@@ -4412,7 +4409,7 @@
 
 	osync_trace(TRACE_INTERNAL, "%s: Is this sink (%s) enabled? %d", __func__, objtype, osync_objtype_sink_is_enabled(sinkenv->sink));
 
-	osync_objtype_sink_set_functions(sinkenv->sink, functions, sinkenv);
+	osync_objtype_sink_set_userdata(sinkenv->sink, sinkenv);
 
 	// Initialize hashtable system
 	osync_objtype_sink_enable_hashtable(sinkenv->sink, TRUE);