Menu
▾
▴
[Opensync-commits] r6114 - plugins/opie-sync/src
|
From: <svn...@op...> - 2010-09-04 22:20:11
|
Author: paule Date: Sun Sep 5 00:20:02 2010 New Revision: 6114 URL: http://www.opensync.org/changeset/6114 Log: opie-sync: fix for changes to osync_error_set() API function; fix warnings about format parameters Modified: plugins/opie-sync/src/opie_format.c Modified: plugins/opie-sync/src/opie_format.c ============================================================================== --- plugins/opie-sync/src/opie_format.c Sun Sep 5 00:13:00 2010 (r6113) +++ plugins/opie-sync/src/opie_format.c Sun Sep 5 00:20:02 2010 (r6114) @@ -47,7 +47,7 @@ **/ static osync_bool conv_opie_xml_contact_to_xml_contact(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, %p, %i, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, config, error); + osync_trace(TRACE_ENTRY, "%s(%p, %i, %p, %p, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, config, userdata, error); int j; // anon_data* anon; gchar** emailtokens = NULL; @@ -338,9 +338,9 @@ GString *emails = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %i, %p, %p, %p, %p)", + osync_trace(TRACE_ENTRY, "%s(%p, %i, %p, %p, %p, %p, %p)", __func__, input, inpsize, output, - outpsize, free_input, config, error); + outpsize, free_input, config, userdata, error); OSyncXMLFormat *in_xmlformat = (OSyncXMLFormat *)input; unsigned int size; @@ -535,7 +535,7 @@ **/ static osync_bool conv_opie_xml_todo_to_xml_todo(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, %p, %i, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, config, error); + osync_trace(TRACE_ENTRY, "%s(%p, %i, %p, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, config, userdata, error); struct _xmlAttr *iprop; int j; OSyncXMLField *out_xmlfield = NULL; @@ -726,9 +726,9 @@ const char *startedstr = NULL; const char *duestr = NULL; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %i, %p, %p, %p, %p)", + osync_trace(TRACE_ENTRY, "%s(%p, %i, %p, %p, %p, %p, %p)", __func__, input, inpsize, output, - outpsize, free_input, config, error); + outpsize, free_input, config, userdata, error); OSyncXMLFormat *in_xmlformat = (OSyncXMLFormat *)input; unsigned int size; @@ -871,7 +871,7 @@ **/ static osync_bool conv_opie_xml_event_to_xml_event(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, %p, %i, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, config, error); + osync_trace(TRACE_ENTRY, "%s(%p, %i, %p, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, config, userdata, error); struct _xmlAttr *iprop; OSyncXMLField *out_xmlfield = NULL; GDate *startdate = NULL; @@ -1061,9 +1061,9 @@ time_t start_time = 0; time_t end_time = 0; - osync_trace(TRACE_ENTRY, "%s(%p, %p, %i, %p, %p, %p, %p)", + osync_trace(TRACE_ENTRY, "%s(%p, %i, %p, %p, %p, %p, %p)", __func__, input, inpsize, output, - outpsize, free_input, config, error); + outpsize, free_input, config, userdata, error); OSyncXMLFormat *in_xmlformat = (OSyncXMLFormat *)input; unsigned int size; @@ -1146,7 +1146,7 @@ **/ static osync_bool conv_opie_xml_note_to_xml_note(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, %p, %i, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, config, error); + osync_trace(TRACE_ENTRY, "%s(%p, %i, %p, %p, %p, %p, %p)", __func__, input, inpsize, output, outpsize, free_input, config, userdata, error); OSyncXMLField *out_xmlfield = NULL; @@ -1213,9 +1213,9 @@ **/ static osync_bool conv_xml_note_to_opie_xml_note(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, %p, %i, %p, %p, %p, %p)", + osync_trace(TRACE_ENTRY, "%s(%p, %i, %p, %p, %p, %p, %p)", __func__, input, inpsize, output, - outpsize, free_input, config, error); + outpsize, free_input, config, userdata, error); OSyncXMLFormat *in_xmlformat = (OSyncXMLFormat *)input; unsigned int size; @@ -1300,17 +1300,13 @@ { OSyncObjFormat *format1 = osync_format_env_find_objformat(env, format1_name); if (!format1) { - char *errmsg = g_strdup_printf("Unable to find format \"%s\"", format1_name); - osync_error_set(error, OSYNC_ERROR_GENERIC, errmsg); - g_free(errmsg); + osync_error_set(error, OSYNC_ERROR_GENERIC, "Unable to find format \"%s\"", format1_name); return FALSE; } OSyncObjFormat *format2 = osync_format_env_find_objformat(env, format2_name); if (!format2) { - char *errmsg = g_strdup_printf("Unable to find format \"%s\"", format2_name); - osync_error_set(error, OSYNC_ERROR_GENERIC, errmsg); - g_free(errmsg); + osync_error_set(error, OSYNC_ERROR_GENERIC, "Unable to find format \"%s\"", format2_name); return FALSE; } |
