Menu
▾
▴
[Opensync-commits] r5774 - format-plugins/vformat/src
|
From: <svn...@op...> - 2009-09-17 01:02:12
|
Author: dgollub Date: Thu Sep 17 02:17:12 2009 New Revision: 5774 URL: http://www.opensync.org/changeset/5774 Log: Port vformat plugin to format_env register API changes. See #1087 Modified: format-plugins/vformat/src/vcard.c format-plugins/vformat/src/vevent.c format-plugins/vformat/src/vjournal.c format-plugins/vformat/src/vnote.c format-plugins/vformat/src/vtodo.c Modified: format-plugins/vformat/src/vcard.c ============================================================================== --- format-plugins/vformat/src/vcard.c Thu Sep 17 02:16:52 2009 (r5773) +++ format-plugins/vformat/src/vcard.c Thu Sep 17 02:17:12 2009 (r5774) @@ -82,18 +82,22 @@ osync_objformat_set_compare_func(format, compare_vcard); osync_objformat_set_destroy_func(format, destroy_vcard); - osync_format_env_register_objformat(env, format); + if (!osync_format_env_register_objformat(env, format, error)) + goto error; + osync_objformat_unref(format); format = osync_objformat_new("vcard30", "contact", error); if (!format) - return FALSE; + goto error; osync_objformat_set_compare_func(format, compare_vcard); osync_objformat_set_destroy_func(format, destroy_vcard); - osync_format_env_register_objformat(env, format); + if (!osync_format_env_register_objformat(env, format, error)) + goto error; + osync_objformat_unref(format); #if 0 /* Filters are not available for 0.40 */ @@ -113,6 +117,9 @@ #endif /* Filters are not available for 0.40 */ return TRUE; + +error: + return FALSE; } osync_bool get_conversion_info(OSyncFormatEnv *env, OSyncError **error) Modified: format-plugins/vformat/src/vevent.c ============================================================================== --- format-plugins/vformat/src/vevent.c Thu Sep 17 02:16:52 2009 (r5773) +++ format-plugins/vformat/src/vevent.c Thu Sep 17 02:17:12 2009 (r5774) @@ -81,12 +81,13 @@ { OSyncObjFormat *format = osync_objformat_new("vevent10", "event", error); if (!format) - return FALSE; + goto error; osync_objformat_set_compare_func(format, compare_vevent); osync_objformat_set_destroy_func(format, destroy_vevent); - osync_format_env_register_objformat(env, format); + if (!osync_format_env_register_objformat(env, format, error)) + goto error; osync_objformat_unref(format); @@ -97,7 +98,9 @@ osync_objformat_set_compare_func(format, compare_vevent); osync_objformat_set_destroy_func(format, destroy_vevent); - osync_format_env_register_objformat(env, format); + if (!osync_format_env_register_objformat(env, format, error)) + goto error; + osync_objformat_unref(format); @@ -118,6 +121,9 @@ */ return TRUE; + +error: + return FALSE; } osync_bool get_conversion_info(OSyncFormatEnv *env, OSyncError **error) Modified: format-plugins/vformat/src/vjournal.c ============================================================================== --- format-plugins/vformat/src/vjournal.c Thu Sep 17 02:16:52 2009 (r5773) +++ format-plugins/vformat/src/vjournal.c Thu Sep 17 02:17:12 2009 (r5774) @@ -63,15 +63,20 @@ { OSyncObjFormat *format = osync_objformat_new("vjournal", "note", error); if (!format) - return FALSE; + goto error; osync_objformat_set_compare_func(format, compare_vjournal); osync_objformat_set_destroy_func(format, destroy_vjournal); - osync_format_env_register_objformat(env, format); + if (!osync_format_env_register_objformat(env, format, error)) + goto error; + osync_objformat_unref(format); return TRUE; + +error: + return FALSE; } osync_bool get_conversion_info(OSyncFormatEnv *env, OSyncError **error) Modified: format-plugins/vformat/src/vnote.c ============================================================================== --- format-plugins/vformat/src/vnote.c Thu Sep 17 02:16:52 2009 (r5773) +++ format-plugins/vformat/src/vnote.c Thu Sep 17 02:17:12 2009 (r5774) @@ -62,15 +62,20 @@ { OSyncObjFormat *format = osync_objformat_new("vnote11", "note", error); if (!format) - return FALSE; + goto error; osync_objformat_set_compare_func(format, compare_vnote); osync_objformat_set_destroy_func(format, destroy_vnote); - osync_format_env_register_objformat(env, format); + if (!osync_format_env_register_objformat(env, format, error)) + goto error; + osync_objformat_unref(format); return TRUE; + +error: + return FALSE; } osync_bool get_conversion_info(OSyncFormatEnv *env, OSyncError **error) Modified: format-plugins/vformat/src/vtodo.c ============================================================================== --- format-plugins/vformat/src/vtodo.c Thu Sep 17 02:16:52 2009 (r5773) +++ format-plugins/vformat/src/vtodo.c Thu Sep 17 02:17:12 2009 (r5774) @@ -74,12 +74,14 @@ { OSyncObjFormat *format = osync_objformat_new("vtodo10", "todo", error); if (!format) - return FALSE; + goto error; osync_objformat_set_compare_func(format, compare_vtodo); osync_objformat_set_destroy_func(format, destroy_vtodo); - osync_format_env_register_objformat(env, format); + if (!osync_format_env_register_objformat(env, format, error)) + goto error; + osync_objformat_unref(format); format = osync_objformat_new("vtodo20", "todo", error); @@ -89,10 +91,15 @@ osync_objformat_set_compare_func(format, compare_vtodo); osync_objformat_set_destroy_func(format, destroy_vtodo); - osync_format_env_register_objformat(env, format); + if (!osync_format_env_register_objformat(env, format, error)) + goto error; + osync_objformat_unref(format); return TRUE; + +error: + return FALSE; } osync_bool get_conversion_info(OSyncFormatEnv *env, OSyncError **error) |
