From: <svn...@op...> - 2009-09-17 21:09:12
|
Author: dgollub Date: Thu Sep 17 23:09:03 2009 New Revision: 5792 URL: http://www.opensync.org/changeset/5792 Log: Change OSyncCapsConverter API of the finalize plugin function: - added OSyncError** as last parameter - changed return value from void to osync_bool To fit the plugin function pattern ... Modified: trunk/opensync/format/opensync_caps_converter.c trunk/opensync/format/opensync_caps_converter.h Modified: trunk/opensync/format/opensync_caps_converter.c ============================================================================== --- trunk/opensync/format/opensync_caps_converter.c Thu Sep 17 22:37:45 2009 (r5791) +++ trunk/opensync/format/opensync_caps_converter.c Thu Sep 17 23:09:03 2009 (r5792) @@ -149,12 +149,13 @@ } } -void osync_caps_converter_finalize(OSyncCapsConverter *converter) +osync_bool osync_caps_converter_finalize(OSyncCapsConverter *converter, OSyncError **error) { osync_assert(converter); - if (converter->finalize_func) { - converter->finalize_func(converter->userdata); - } + if (!converter->finalize_func) + return TRUE; + + return converter->finalize_func(converter->userdata, error); } Modified: trunk/opensync/format/opensync_caps_converter.h ============================================================================== --- trunk/opensync/format/opensync_caps_converter.h Thu Sep 17 22:37:45 2009 (r5791) +++ trunk/opensync/format/opensync_caps_converter.h Thu Sep 17 23:09:03 2009 (r5792) @@ -31,7 +31,7 @@ typedef osync_bool (* OSyncCapsConvertFunc) (OSyncCapabilities *oldcaps, OSyncCapabilities **newcaps, const char *config, void *userdata, OSyncError **error); typedef void * (* OSyncCapsConverterInitializeFunc) (const char *config, OSyncError **error); -typedef void (* OSyncCapsConverterFinalizeFunc) (void *userdata); +typedef osync_bool (* OSyncCapsConverterFinalizeFunc) (void *userdata, OSyncError **error); /** * @brief Creates a new converter @@ -112,8 +112,10 @@ * @brief Invokes finalize function of a converter * * @param converter Pointer to the converter which should be finalized + * @param error Pointer to an error struct + * @returns TRUE on success, FALSE otherwise */ -OSYNC_EXPORT void osync_caps_converter_finalize(OSyncCapsConverter *converter); +OSYNC_EXPORT osync_bool osync_caps_converter_finalize(OSyncCapsConverter *converter, OSyncError **error); /*@}*/ |