[Opensync-commits] r5265 - in trunk/tests: . engine-tests ipc-tests mock-plugin

[<dg...@su...>]

Author: bricks
Date: Fri Feb 13 09:52:28 2009
New Revision: 5265
URL: http://www.opensync.org/changeset/5265

Log:
Fixed some indentation, typos and compiler warnings in tests

Modified:
   trunk/tests/engine-tests/check_engine_error.c
   trunk/tests/ipc-tests/check_ipc.c
   trunk/tests/mock-plugin/mock_sync.c
   trunk/tests/support.c

Modified: trunk/tests/engine-tests/check_engine_error.c
==============================================================================
--- trunk/tests/engine-tests/check_engine_error.c	Fri Feb 13 09:42:09 2009	(r5264)
+++ trunk/tests/engine-tests/check_engine_error.c	Fri Feb 13 09:52:28 2009	(r5265)
@@ -33,6 +33,7 @@
 int num_disconnect = 0;
 int num_get_changes = 0;
 
+/*
 static void connect1(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data)
 {
 	osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx);
@@ -43,6 +44,7 @@
 	
 	osync_trace(TRACE_EXIT, "%s", __func__);
 }
+*/
 
 static void connect_error(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data)
 {
@@ -77,6 +79,7 @@
 	osync_trace(TRACE_EXIT, "%s", __func__);
 }
 
+/*
 static void *initialize_error(OSyncPlugin *plugin, OSyncPluginInfo *info, OSyncError **error)
 {
 	osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, info, error);
@@ -119,6 +122,7 @@
 	osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(error));
 	return NULL;
 }
+*/
 
 static void *initialize_connect_error(OSyncPlugin *plugin, OSyncPluginInfo *info, OSyncError **error)
 {
@@ -147,6 +151,7 @@
 	return (void *)env;
 }
 
+
 static void finalize(void *data)
 {
 	mock_env *env = data;

Modified: trunk/tests/ipc-tests/check_ipc.c
==============================================================================
--- trunk/tests/ipc-tests/check_ipc.c	Fri Feb 13 09:42:09 2009	(r5264)
+++ trunk/tests/ipc-tests/check_ipc.c	Fri Feb 13 09:52:28 2009	(r5265)
@@ -2102,7 +2102,6 @@
 void client_handler5(OSyncMessage *message, void *user_data)
 {
 	osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, message, user_data);
-	OSyncError *error = NULL;
 	
 	osync_assert(GPOINTER_TO_INT(user_data) ==1);
 	osync_assert(osync_message_get_command(message) == OSYNC_MESSAGE_INITIALIZE);
@@ -2608,7 +2607,6 @@
 void client_handler_first_part(OSyncMessage *message, void *user_data)
 {
 	osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, message, user_data);
-	OSyncError *error = NULL;
 	
 	osync_assert(GPOINTER_TO_INT(user_data) ==1);
 	osync_assert(osync_message_get_command(message) == OSYNC_MESSAGE_INITIALIZE);
@@ -2812,7 +2810,6 @@
 void client_handler6(OSyncMessage *message, void *user_data)
 {
 	osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, message, user_data);
-	OSyncError *error = NULL;
 	
 	osync_assert(GPOINTER_TO_INT(user_data) ==1);
 

Modified: trunk/tests/mock-plugin/mock_sync.c
==============================================================================
--- trunk/tests/mock-plugin/mock_sync.c	Fri Feb 13 09:42:09 2009	(r5264)
+++ trunk/tests/mock-plugin/mock_sync.c	Fri Feb 13 09:52:28 2009	(r5265)
@@ -117,7 +117,7 @@
 		osync_objtype_sink_set_slowsync(sink, TRUE);
 
 	/* Validate connect_done() call before get_changes(),
-	 * and after conncet().
+	 * and after connect().
 	 */
 	osync_assert(!dir->connect_done);
 	dir->connect_done = TRUE;
@@ -652,7 +652,7 @@
 		//Rewrite the batch commit functions so we can enable them if necessary
 		if (mock_get_error(info->memberid, "BATCH_COMMIT")) {
 			osync_trace(TRACE_INTERNAL, "Enabling batch_commit on %p:%s", sink, osync_objtype_sink_get_name(sink) ? osync_objtype_sink_get_name(sink) : "None");
-	                functions.batch_commit = mock_batch_commit; 
+			functions.batch_commit = mock_batch_commit; 
 		} else {
 			functions.committed_all = mock_committed_all;
 			functions.commit = mock_commit_change;

Modified: trunk/tests/support.c
==============================================================================
--- trunk/tests/support.c	Fri Feb 13 09:42:09 2009	(r5264)
+++ trunk/tests/support.c	Fri Feb 13 09:52:28 2009	(r5265)
@@ -159,7 +159,7 @@
 	g_free(command);
 
 #ifndef _WIN32	/* chmod is useless on windows system */
-        command = g_strdup_printf("chmod -R 700 %s", testbed);
+	command = g_strdup_printf("chmod -R 700 %s", testbed);
 	if (system(command))
 		abort();
 	g_free(command);