Menu
▾
▴
[Opensync-commits] r5791 - in format-plugins/vformat: src tests tools
|
From: <svn...@op...> - 2009-09-17 20:37:59
|
Author: dgollub Date: Thu Sep 17 22:37:45 2009 New Revision: 5791 URL: http://www.opensync.org/changeset/5791 Log: Convert to latest Format plugin API changes for destory, compare and print plugin functions Modified: format-plugins/vformat/src/vcard.c format-plugins/vformat/src/vevent.c format-plugins/vformat/src/vjournal.c format-plugins/vformat/src/vtodo.c format-plugins/vformat/tests/conversion.c format-plugins/vformat/tools/vconvert.c Modified: format-plugins/vformat/src/vcard.c ============================================================================== --- format-plugins/vformat/src/vcard.c Thu Sep 17 22:28:40 2009 (r5790) +++ format-plugins/vformat/src/vcard.c Thu Sep 17 22:37:45 2009 (r5791) @@ -24,7 +24,7 @@ #include <glib.h> #include <string.h> -static OSyncConvCmpResult compare_vcard(const char *leftdata, unsigned int leftsize, const char *rightdata, unsigned int rightsize, void *user_data) +static OSyncConvCmpResult compare_vcard(const char *leftdata, unsigned int leftsize, const char *rightdata, unsigned int rightsize, void *user_data, OSyncError **error) { /* Consider empty block equal NULL pointers */ if (!leftsize) leftdata = NULL; @@ -68,9 +68,10 @@ } #endif -static void destroy_vcard(char *input, unsigned int inpsize, void *user_data) +static osync_bool destroy_vcard(char *input, unsigned int inpsize, void *user_data, OSyncError **error) { g_free(input); + return TRUE; } osync_bool get_format_info(OSyncFormatEnv *env, OSyncError **error) Modified: format-plugins/vformat/src/vevent.c ============================================================================== --- format-plugins/vformat/src/vevent.c Thu Sep 17 22:28:40 2009 (r5790) +++ format-plugins/vformat/src/vevent.c Thu Sep 17 22:37:45 2009 (r5791) @@ -33,7 +33,7 @@ * osync_env_format_set_like(). */ -static OSyncConvCmpResult compare_vevent(const char *leftdata, unsigned int leftsize, const char *rightdata, unsigned int rightsize, void *user_data) +static OSyncConvCmpResult compare_vevent(const char *leftdata, unsigned int leftsize, const char *rightdata, unsigned int rightsize, void *user_data, OSyncError **error) { /* Consider empty block equal NULL pointers */ if (!leftsize) leftdata = NULL; @@ -72,9 +72,10 @@ return g_pattern_match_simple("*BEGIN:VCALENDAR*VERSION:2.0*BEGIN:VEVENT*", data); } -static void destroy_vevent(char *input, unsigned int inpsize, void *user_data) +static osync_bool destroy_vevent(char *input, unsigned int inpsize, void *user_data, OSyncError **error) { g_free(input); + return TRUE; } osync_bool get_format_info(OSyncFormatEnv *env, OSyncError **error) Modified: format-plugins/vformat/src/vjournal.c ============================================================================== --- format-plugins/vformat/src/vjournal.c Thu Sep 17 22:28:40 2009 (r5790) +++ format-plugins/vformat/src/vjournal.c Thu Sep 17 22:37:45 2009 (r5791) @@ -25,7 +25,7 @@ #include <glib.h> #include <string.h> -static OSyncConvCmpResult compare_vjournal(const char *leftdata, unsigned int leftsize, const char *rightdata, unsigned int rightsize, void *user_data) +static OSyncConvCmpResult compare_vjournal(const char *leftdata, unsigned int leftsize, const char *rightdata, unsigned int rightsize, void *user_data, OSyncError **error) { /* Consider empty block equal NULL pointers */ if (!leftsize) leftdata = NULL; @@ -54,9 +54,10 @@ return g_pattern_match_simple("*BEGIN:VJOURNAL*", data); } -static void destroy_vjournal(char *input, unsigned int inpsize, void *user_data) +static osync_bool destroy_vjournal(char *input, unsigned int inpsize, void *user_data, OSyncError **error) { g_free(input); + return TRUE; } osync_bool get_format_info(OSyncFormatEnv *env, OSyncError **error) Modified: format-plugins/vformat/src/vtodo.c ============================================================================== --- format-plugins/vformat/src/vtodo.c Thu Sep 17 22:28:40 2009 (r5790) +++ format-plugins/vformat/src/vtodo.c Thu Sep 17 22:37:45 2009 (r5791) @@ -26,7 +26,7 @@ #include <string.h> /** @defgroup todo_vtodo todo/vtodo data format */ -static OSyncConvCmpResult compare_vtodo(const char *leftdata, unsigned int leftsize, const char *rightdata, unsigned int rightsize, void *user_data) +static OSyncConvCmpResult compare_vtodo(const char *leftdata, unsigned int leftsize, const char *rightdata, unsigned int rightsize, void *user_data, OSyncError **error) { /* Consider empty block equal NULL pointers */ if (!leftsize) leftdata = NULL; @@ -65,9 +65,10 @@ return g_pattern_match_simple("*BEGIN:VCALENDAR*VERSION:2.0*BEGIN:VTODO*", data); } -static void destroy_vtodo(char *input, unsigned int inpsize, void *user_data) +static osync_bool destroy_vtodo(char *input, unsigned int inpsize, void *user_data, OSyncError **error) { g_free(input); + return TRUE; } osync_bool get_format_info(OSyncFormatEnv *env, OSyncError **error) Modified: format-plugins/vformat/tests/conversion.c ============================================================================== --- format-plugins/vformat/tests/conversion.c Thu Sep 17 22:28:40 2009 (r5790) +++ format-plugins/vformat/tests/conversion.c Thu Sep 17 22:37:45 2009 (r5791) @@ -123,14 +123,17 @@ osync_converter_path_unref(path); - char *xml1 = osync_data_get_printable(data); - char *xml2 = osync_data_get_printable(newdata); + char *xml1 = osync_data_get_printable(data, &error); + fail_unless(error == NULL, NULL); + char *xml2 = osync_data_get_printable(newdata, &error); + fail_unless(error == NULL, NULL); osync_trace(TRACE_INTERNAL, "ConvertedXML:\n%s\nOriginal:\n%s\n", xml1, xml2); g_free(xml1); g_free(xml2); //Compare again - fail_unless(osync_change_compare(newchange, change) == OSYNC_CONV_DATA_SAME, NULL); + fail_unless(osync_change_compare(newchange, change, &error) == OSYNC_CONV_DATA_SAME, NULL); + fail_unless(error == NULL, NULL); osync_data_unref(data); osync_data_unref(newdata); @@ -222,7 +225,8 @@ osync_converter_path_unref(path); // compare - fail_unless(osync_change_compare(lchange, rchange) == result, NULL); + fail_unless(osync_change_compare(lchange, rchange, &error) == result, NULL); + fail_unless(error == NULL, NULL); osync_format_env_unref(format_env); osync_change_unref(lchange); Modified: format-plugins/vformat/tools/vconvert.c ============================================================================== --- format-plugins/vformat/tools/vconvert.c Thu Sep 17 22:28:40 2009 (r5790) +++ format-plugins/vformat/tools/vconvert.c Thu Sep 17 22:37:45 2009 (r5791) @@ -341,7 +341,10 @@ } // print data or store it into 'output' - print = osync_data_get_printable(data); + print = osync_data_get_printable(data, &error); + if (!print) + goto error; + if (output) { if (!osync_file_write(output, print, strlen(print), 0644, &error)) { fprintf(stderr, "Unable to write file %s", output); |
