[Opensync-commits] r5483 - in trunk: . tests/mock-plugin

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

Author: bellmich
Date: Tue Mar 31 13:30:58 2009
New Revision: 5483
URL: http://www.opensync.org/changeset/5483

Log:
renamed OSyncAnchor to OSyncSinkStateDB

Modified:
   trunk/opensync.sym
   trunk/tests/mock-plugin/mock_sync.c

Modified: trunk/opensync.sym
==============================================================================
--- trunk/opensync.sym	Tue Mar 31 13:30:31 2009	(r5482)
+++ trunk/opensync.sym	Tue Mar 31 13:30:58 2009	(r5483)
@@ -1,6 +1,3 @@
-osync_anchor_compare
-osync_anchor_retrieve
-osync_anchor_update
 osync_capabilities_assemble
 osync_capabilities_get_first
 osync_capabilities_new
@@ -372,10 +369,9 @@
 osync_objtype_sink_connect
 osync_objtype_sink_connect_done
 osync_objtype_sink_disconnect
-osync_objtype_sink_enable_anchor
 osync_objtype_sink_enable_hashtable
+osync_objtype_sink_enable_state_db
 osync_objtype_sink_find_objformat_sink
-osync_objtype_sink_get_anchor
 osync_objtype_sink_get_changes
 osync_objtype_sink_get_getchanges
 osync_objtype_sink_get_hashtable
@@ -383,12 +379,13 @@
 osync_objtype_sink_get_objformat_sinks
 osync_objtype_sink_get_preferred_format
 osync_objtype_sink_get_read
+osync_objtype_sink_get_state_db
 osync_objtype_sink_get_write
 osync_objtype_sink_is_available
 osync_objtype_sink_is_enabled
-osync_objtype_sink_load_anchor
 osync_objtype_sink_load_hashtable
 osync_objtype_sink_new
+osync_objtype_sink_open_state_db
 osync_objtype_sink_read_change
 osync_objtype_sink_ref
 osync_objtype_sink_remove_objformat_sink
@@ -624,6 +621,9 @@
 osync_rand_str
 osync_sink_engine_get_mapping_entry_engines
 osync_sink_engine_get_member
+osync_sink_state_equal
+osync_sink_state_get
+osync_sink_state_set
 osync_strdup
 osync_strdup_printf
 osync_strreplace

Modified: trunk/tests/mock-plugin/mock_sync.c
==============================================================================
--- trunk/tests/mock-plugin/mock_sync.c	Tue Mar 31 13:30:31 2009	(r5482)
+++ trunk/tests/mock-plugin/mock_sync.c	Tue Mar 31 13:30:58 2009	(r5483)
@@ -52,8 +52,8 @@
 
 static void mock_connect(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data)
 {
-	osync_bool anchor_compare_match;
-	OSyncAnchor *anchor = osync_objtype_sink_get_anchor(sink); 
+	osync_bool state_match;
+	OSyncSinkStateDB *state_db = osync_objtype_sink_get_state_db(sink); 
 	MockDir *dir = data;
 
 	osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, sink, info, ctx, data);
@@ -73,7 +73,7 @@
 	if (mock_get_error(info->memberid, "CONNECT_SLOWSYNC"))
 		osync_context_report_slowsync(ctx);
 
-	/* Skip Objtype related stuff like hashtable and anchor */
+	/* Skip Objtype related stuff like hashtable and state db */
 	if (mock_get_error(info->memberid, "MAINSINK_CONNECT"))
 		goto end;
 
@@ -87,9 +87,9 @@
 	 */
 	dir->connect_done = FALSE;
 
-	osync_assert_msg(osync_anchor_compare(anchor, "path", dir->path, &anchor_compare_match, NULL), "Not expected to fail");
+	osync_assert_msg(osync_sink_state_equal(state_db, "path", dir->path, &state_match, NULL), "Not expected to fail");
 
-	if (!anchor_compare_match)
+	if (!state_match)
 		osync_context_report_slowsync(ctx);
 
 	osync_assert(g_file_test(dir->path, G_FILE_TEST_IS_DIR));
@@ -553,7 +553,7 @@
 static void mock_sync_done(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data)
 {
 	osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, sink, info, ctx, data);
-	OSyncAnchor *anchor = osync_objtype_sink_get_anchor(sink);
+	OSyncSinkStateDB *state_db = osync_objtype_sink_get_state_db(sink);
 	MockDir *dir = data;
 
 	if (mock_get_error(info->memberid, "SYNC_DONE_ERROR")) {
@@ -563,7 +563,7 @@
 	if (mock_get_error(info->memberid, "SYNC_DONE_TIMEOUT"))
 		return;
 	
-	osync_assert_msg(osync_anchor_update(anchor, "path", dir->path, NULL), "Not expected to fail!");
+	osync_assert_msg(osync_sink_state_set(state_db, "path", dir->path, NULL), "Not expected to fail!");
 	
 	osync_context_report_success(ctx);
 	
@@ -672,7 +672,7 @@
 		osync_objtype_sink_set_userdata(sink, dir);
 
 		/* Request an Anchor */
-		osync_objtype_sink_enable_anchor(sink, TRUE);
+		osync_objtype_sink_enable_state_db(sink, TRUE);
 
 		/* Request an Hashtable */
 		osync_objtype_sink_enable_hashtable(sink, TRUE);