[Opensync-commits] r5959 - format-plugins/vformat/src

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

Author: cdfrey
Date: Wed Nov 11 01:09:16 2009
New Revision: 5959
URL: http://www.opensync.org/changeset/5959

Log:
Fixed more printf-style format strings

Modified:
   format-plugins/vformat/src/vformat.c
   format-plugins/vformat/src/xmlformat-vcard.c
   format-plugins/vformat/src/xmlformat-vnote.c

Modified: format-plugins/vformat/src/vformat.c
==============================================================================
--- format-plugins/vformat/src/vformat.c	Wed Nov 11 00:58:50 2009	(r5958)
+++ format-plugins/vformat/src/vformat.c	Wed Nov 11 01:09:16 2009	(r5959)
@@ -873,7 +873,7 @@
 			  /* \t is (incorrectly) used by kOrganizer, so handle it here */
 			case 't': str = g_string_append_c (str, '\t'); break;
 			default:
-				osync_trace(TRACE_INTERNAL, "invalid escape, passing it through. escaped char was %s", *p);
+				osync_trace(TRACE_INTERNAL, "invalid escape, passing it through. escaped char was %c", *p);
 				str = g_string_append_c (str, '\\');
 				str = g_string_append_unichar (str, g_utf8_get_char(p));
 				break;

Modified: format-plugins/vformat/src/xmlformat-vcard.c
==============================================================================
--- format-plugins/vformat/src/xmlformat-vcard.c	Wed Nov 11 00:58:50 2009	(r5958)
+++ format-plugins/vformat/src/xmlformat-vcard.c	Wed Nov 11 01:09:16 2009	(r5959)
@@ -977,7 +977,7 @@
 
 osync_bool conv_vcard_to_xmlformat(char *input, unsigned int inpsize, char **output, unsigned int *outpsize, osync_bool *free_input, const char *config, void *userdata, OSyncError **error)
 {
-	osync_trace(TRACE_ENTRY, "%s(%p, %i, %p, %i, %p, %s, %p)", __func__, input, inpsize, output, outpsize, free_input, config, error);
+	osync_trace(TRACE_ENTRY, "%s(%s, %u, %p, %p, %p, %s, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, config, userdata, error);
 	
 	OSyncHookTables *hooks = init_vcard_to_xmlformat();
 	

Modified: format-plugins/vformat/src/xmlformat-vnote.c
==============================================================================
--- format-plugins/vformat/src/xmlformat-vnote.c	Wed Nov 11 00:58:50 2009	(r5958)
+++ format-plugins/vformat/src/xmlformat-vnote.c	Wed Nov 11 01:09:16 2009	(r5959)
@@ -48,7 +48,7 @@
 
 osync_bool conv_vnote_to_xmlformat(char *input, unsigned int inpsize, char **output, unsigned int *outpsize, osync_bool *free_input, const char *config, void *userdata, OSyncError **error)
 {
-	osync_trace(TRACE_ENTRY, "%s(%p, %i, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, config, error);
+	osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %s, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, config, userdata, error);
 	
 	OSyncHookTables *hooks = init_vnote_to_xmlformat(VFORMAT_NOTE);
 	
@@ -121,7 +121,7 @@
 
 static osync_bool conv_xmlformat_to_vnotememo(char *input, unsigned int inpsize, char **output, unsigned int *outpsize, osync_bool *free_input, const char *config, OSyncError **error, int target)
 {
-	osync_trace(TRACE_ENTRY, "%s(%p, %i, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, config, error);
+	osync_trace(TRACE_ENTRY, "%s(%p, %u, %p, %p, %p, %s, %p, %i)", __func__, input, inpsize, output, outpsize, free_input, config, error, target);
 	
 	OSyncHookTables *hooks = init_xmlformat_to_vnote();