[Opensync-commits] r1359 - trunk/tools

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

Author: bellmich
Date: Mon Feb 22 16:09:54 2010
New Revision: 1359
URL: http://libsyncml.opensync.org/changeset/1359

Log:
- fixed some wrong trace statements
- added a sanity check

Modified:
   trunk/tools/syncml-ds-tool.c

Modified: trunk/tools/syncml-ds-tool.c
==============================================================================
--- trunk/tools/syncml-ds-tool.c	Mon Feb 22 14:31:36 2010	(r1358)
+++ trunk/tools/syncml-ds-tool.c	Mon Feb 22 16:09:54 2010	(r1359)
@@ -969,7 +969,9 @@
 					goto error;
 
 				/* migrate all entries from committed_index to last_index */
-				char **keys = g_key_file_get_keys(datastore->index, "committed_index", NULL, NULL);
+				char **keys = NULL;
+				if (g_key_file_has_group(datastore->index, "committed_index"))
+					keys = g_key_file_get_keys(datastore->index, "committed_index", NULL, NULL);
 				int pos = 0;
 				while (keys != NULL && keys[pos] != NULL)
 				{
@@ -1001,7 +1003,7 @@
 			smlSafeCFree(&absolute);
 		}
 	}
-	smlTrace(TRACE_EXIT, "%s");
+	smlTrace(TRACE_EXIT, "%s", __func__);
 	return;
 error:
 	smlTrace(TRACE_EXIT_ERROR, "%s - %s", error->message);
@@ -1203,7 +1205,7 @@
 			g_message("ERROR: %s\n", error->message);
 			writeSyncStatus(FALSE);
 			// g_error_free(error);
-			smlTrace(TRACE_EXIT_ERROR, "%s - failed.");
+			smlTrace(TRACE_EXIT_ERROR, "%s - failed.", __func__);
 			exit(2);
 			break;
 		case SML_DATA_SYNC_SESSION_EVENT_CONNECT: