[Opensync-commits] r6052 - osynctool/trunk/tools

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

Author: cdfrey
Date: Mon Jul  5 20:53:52 2010
New Revision: 6052
URL: http://www.opensync.org/changeset/6052

Log:
Updated format strings for new long long changes

Modified:
   osynctool/trunk/tools/osynctool.c

Modified: osynctool/trunk/tools/osynctool.c
==============================================================================
--- osynctool/trunk/tools/osynctool.c	Mon Jul  5 20:51:38 2010	(r6051)
+++ osynctool/trunk/tools/osynctool.c	Mon Jul  5 20:53:52 2010	(r6052)
@@ -245,28 +245,28 @@
 	
 	switch (osync_engine_member_update_get_event(status)) {
 		case OSYNC_ENGINE_MEMBER_EVENT_CONNECTED:
-			printf("%s of member %lli of type %s just connected\n", sink, osync_member_get_id(member), osync_member_get_pluginname(member));
+			printf("%s of member %i of type %s just connected\n", sink, osync_member_get_id(member), osync_member_get_pluginname(member));
 			break;
 		case OSYNC_ENGINE_MEMBER_EVENT_CONNECT_DONE:
 			/* Special event - but not interesting for the normal user. */
 			break;
 		case OSYNC_ENGINE_MEMBER_EVENT_DISCONNECTED:
-			printf("%s of member %lli of type %s just disconnected\n", sink, osync_member_get_id(member), osync_member_get_pluginname(member));
+			printf("%s of member %i of type %s just disconnected\n", sink, osync_member_get_id(member), osync_member_get_pluginname(member));
 			break;
 		case OSYNC_ENGINE_MEMBER_EVENT_READ:
-			printf("%s of member %lli of type %s just sent all changes\n", sink, osync_member_get_id(member), osync_member_get_pluginname(member));
+			printf("%s of member %i of type %s just sent all changes\n", sink, osync_member_get_id(member), osync_member_get_pluginname(member));
 			break;
 		case OSYNC_ENGINE_MEMBER_EVENT_WRITTEN:
-			printf("%s of member %lli of type %s committed all changes.\n", sink, osync_member_get_id(member), osync_member_get_pluginname(member));
+			printf("%s of member %i of type %s committed all changes.\n", sink, osync_member_get_id(member), osync_member_get_pluginname(member));
 			break;
 		case OSYNC_ENGINE_MEMBER_EVENT_SYNC_DONE:
-			printf("%s of member %lli of type %s reported sync done.\n", sink, osync_member_get_id(member), osync_member_get_pluginname(member));
+			printf("%s of member %i of type %s reported sync done.\n", sink, osync_member_get_id(member), osync_member_get_pluginname(member));
 			break;
 		case OSYNC_ENGINE_MEMBER_EVENT_DISCOVERED:
-			printf("%s of member %lli of type %s discovered its objtypes.\n", sink, osync_member_get_id(member), osync_member_get_pluginname(member));
+			printf("%s of member %i of type %s discovered its objtypes.\n", sink, osync_member_get_id(member), osync_member_get_pluginname(member));
 			break;
 		case OSYNC_ENGINE_MEMBER_EVENT_ERROR:
-			printf("%s of member %lli of type %s had an error: %s\n", sink, osync_member_get_id(member), osync_member_get_pluginname(member), osync_error_print(&error));
+			printf("%s of member %i of type %s had an error: %s\n", sink, osync_member_get_id(member), osync_member_get_pluginname(member), osync_error_print(&error));
 			break;
 	}
 	
@@ -329,7 +329,7 @@
 				}
 			}
 
-			printf("\tMember %lli: Adding(%u) Modifying(%u) Deleting(%u)\n",
+			printf("\tMember %i: Adding(%u) Modifying(%u) Deleting(%u)\n",
 					osync_member_get_id(member),
 					added, modified, deleted);
 
@@ -391,7 +391,7 @@
 	
 	switch (osync_engine_change_update_get_event(status)) {
 		case OSYNC_ENGINE_CHANGE_EVENT_READ:
-			printf("Received an entry %s (%s) from member %lli (%s). Changetype %s\n",
+			printf("Received an entry %s (%s) from member %i (%s). Changetype %s\n",
 					osync_change_get_uid(change),
 					osync_objformat_get_name(osync_change_get_objformat(change)),
 					osync_member_get_id(member),
@@ -399,7 +399,7 @@
 					OSyncChangeType2String(osync_change_get_changetype(change)));
 			break;
 		case OSYNC_ENGINE_CHANGE_EVENT_WRITTEN:
-			printf("Sent an entry %s (%s) to member %lli (%s). Changetype %s\n",
+			printf("Sent an entry %s (%s) to member %i (%s). Changetype %s\n",
 					osync_change_get_uid(change),
 					osync_objformat_get_name(osync_change_get_objformat(change)),
 					osync_member_get_id(member),
@@ -407,7 +407,7 @@
 					OSyncChangeType2String(osync_change_get_changetype(change)));
 			break;
 		case OSYNC_ENGINE_CHANGE_EVENT_ERROR:
-			printf("Error for entry %s (%s) and member %lli (%s): %s\n",
+			printf("Error for entry %s (%s) and member %i (%s): %s\n",
 					osync_change_get_uid(change),
 					osync_objformat_get_name(osync_change_get_objformat(change)),
 					osync_member_get_id(member),
@@ -523,7 +523,7 @@
 					osync_error_unref(&error);
 					return;
 				}
-				printf("\nEntry %i:\nMember: %lli (%s)\nUID: %s\n%s\n", i+1, 
+				printf("\nEntry %i:\nMember: %i (%s)\nUID: %s\n%s\n", i+1, 
 						osync_member_get_id(member), 
 						osync_member_get_pluginname(member),
 						osync_change_get_uid(change), 
@@ -657,7 +657,7 @@
 		OSyncMember *member = (OSyncMember *) m->data;
 		OSyncList *objtypes = osync_member_get_objtypes(member);
 		if (osync_list_length(objtypes) == 0) {
-			printf("Member %llu has no objtypes. Has it already been discovered?\n", osync_member_get_id(member));
+			printf("Member %i has no objtypes. Has it already been discovered?\n", osync_member_get_id(member));
 		}
 	}
 	osync_list_free(members);
@@ -751,9 +751,9 @@
 		member = (OSyncMember *) m->data;
 		membername = osync_member_get_name(member);
 		if (membername) {
-			printf("Member %lli (%s): %s\n", osync_member_get_id(member), membername, osync_member_get_pluginname(member));
+			printf("Member %i (%s): %s\n", osync_member_get_id(member), membername, osync_member_get_pluginname(member));
 		} else {
-			printf("Member %lli: %s\n", osync_member_get_id(member), osync_member_get_pluginname(member));
+			printf("Member %i: %s\n", osync_member_get_id(member), osync_member_get_pluginname(member));
 		}
 
 		/*
@@ -791,9 +791,9 @@
 		OSyncMember *member = (OSyncMember *) m->data;
 		OSyncList *o, *objtypes = osync_member_get_objtypes(member);
 		if (osync_list_length(objtypes) == 0) {
-			printf("Member %lli has no objtypes. Has it already been discovered?\n", osync_member_get_id(member));
+			printf("Member %i has no objtypes. Has it already been discovered?\n", osync_member_get_id(member));
 		} else {
-			printf("Member %lli Objtypes:\n", osync_member_get_id(member));
+			printf("Member %i Objtypes:\n", osync_member_get_id(member));
 			
 			for (o=objtypes; o; o = o->next) {
 				const char *objtype = (const char *) o->data;
@@ -857,7 +857,7 @@
 	members = osync_group_get_members(group);
 	for (m=members; m; m = m->next) {
 		member = (OSyncMember *) m->data;
-		printf("Member %lli: %s\n", osync_member_get_id(member), osync_member_get_pluginname(member));
+		printf("Member %i: %s\n", osync_member_get_id(member), osync_member_get_pluginname(member));
 
 		OSyncCapabilities *capabilities = osync_member_get_capabilities(member);
 		if (!capabilities) {
@@ -1192,7 +1192,7 @@
 		/* Otherwise configure all sinks */
 		objtypes = osync_member_get_objtypes(member);
 		if (osync_list_length(objtypes) == 0) {
-			osync_error_set(error, OSYNC_ERROR_GENERIC, "Member %lli has no objtypes. Has it already been discovered?\n", osync_member_get_id(member));
+			osync_error_set(error, OSYNC_ERROR_GENERIC, "Member %i has no objtypes. Has it already been discovered?\n", osync_member_get_id(member));
 			goto error;
 		} else {
 			for (o = objtypes; o; o = o->next) {