[Opensync-commits] r5925 - trunk/opensync/helper

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

Author: dgollub
Date: Thu Nov  5 17:25:05 2009
New Revision: 5925
URL: http://www.opensync.org/changeset/5925

Log:
Introduce internal hashtable function to update the UID.
This got introduced for osync_context_report_uid_update()

see #1161

Modified:
   trunk/opensync/helper/opensync_hashtable.c
   trunk/opensync/helper/opensync_hashtable_internals.h

Modified: trunk/opensync/helper/opensync_hashtable.c
==============================================================================
--- trunk/opensync/helper/opensync_hashtable.c	Wed Nov  4 23:20:52 2009	(r5924)
+++ trunk/opensync/helper/opensync_hashtable.c	Thu Nov  5 17:25:05 2009	(r5925)
@@ -350,6 +350,45 @@
 	osync_trace(TRACE_EXIT, "%s", __func__);
 }
 
+osync_bool osync_hashtable_update_uid(OSyncHashTable *table, const char *olduid, const char *newuid, OSyncError **error)
+{
+	const char *hash = NULL;
+	char *origkey = NULL;
+
+	osync_assert(table);
+	osync_assert(table->dbhandle);
+
+	osync_trace(TRACE_ENTRY, "%s(%p)", __func__, table);
+
+
+	/* Get the old hash */
+	hash = osync_hashtable_get_hash(table, olduid);
+
+	if (!g_hash_table_lookup_extended(table->db_entries, olduid, (gpointer *) &origkey, NULL)) {
+		osync_error_set(error, OSYNC_ERROR_GENERIC, "Couldn't found hash with UID \"%s\" which requires an UID update.", olduid);
+		goto error;
+	}
+
+	if (g_hash_table_lookup(table->db_entries, newuid)) {
+		osync_error_set(error, OSYNC_ERROR_GENERIC, "Couldn't update UID in hashtable, UID \"%s\" already exists!", newuid);
+		goto error;
+	}
+
+	g_hash_table_insert(table->db_entries, g_strdup(newuid), g_strdup(hash));
+
+	if (!g_hash_table_remove(table->db_entries, olduid)) {
+		osync_error_set(error, OSYNC_ERROR_GENERIC, "Couldn't remove old hash entry with UID \"%s\".", olduid); 
+		goto error;
+	}
+
+	osync_trace(TRACE_EXIT, "%s", __func__);
+	return TRUE;
+
+error:
+	osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(error));
+	return FALSE;
+}
+
 struct callback_data {
 	OSyncList *deleted_entries;
 	OSyncHashTable *table;

Modified: trunk/opensync/helper/opensync_hashtable_internals.h
==============================================================================
--- trunk/opensync/helper/opensync_hashtable_internals.h	Wed Nov  4 23:20:52 2009	(r5924)
+++ trunk/opensync/helper/opensync_hashtable_internals.h	Thu Nov  5 17:25:05 2009	(r5925)
@@ -105,5 +105,8 @@
  */
 OSYNC_TEST_EXPORT unsigned int osync_hashtable_num_entries(OSyncHashTable *table);
 
+
+OSYNC_TEST_EXPORT osync_bool osync_hashtable_update_uid(OSyncHashTable *table, const char *olduid, const char *newuid, OSyncError **error);
+
 #endif /*_OPENSYNC_HASHTABLE_INTERNALS_H_*/