Menu
▾
▴
[Opensync-commits] r5772 - in trunk: opensync/format opensync/plugin tests/engine-tests tests/format-tests tests/mock-plugin wrapper
|
From: <svn...@op...> - 2009-09-17 00:52:03
|
Author: dgollub Date: Thu Sep 17 02:15:23 2009 New Revision: 5772 URL: http://www.opensync.org/changeset/5772 Log: Make plugin/format enviroment API more future-proof and add for all register interfaces an error struct to the parameter list refs #1087, comment:36 Modified: trunk/opensync/format/opensync_format_env.c trunk/opensync/format/opensync_format_env.h trunk/opensync/format/opensync_format_env_internals.h trunk/opensync/plugin/opensync_plugin_env.c trunk/opensync/plugin/opensync_plugin_env.h trunk/tests/engine-tests/check_engine.c trunk/tests/engine-tests/check_engine_error.c trunk/tests/format-tests/check_conv.c trunk/tests/format-tests/check_format_env.c trunk/tests/mock-plugin/mock_format.c trunk/tests/mock-plugin/mock_sync.c trunk/wrapper/opensync-format.i trunk/wrapper/opensync-plugin.i Modified: trunk/opensync/format/opensync_format_env.c ============================================================================== --- trunk/opensync/format/opensync_format_env.c Thu Sep 17 01:30:03 2009 (r5771) +++ trunk/opensync/format/opensync_format_env.c Thu Sep 17 02:15:23 2009 (r5772) @@ -810,13 +810,15 @@ return FALSE; } -void osync_format_env_register_objformat(OSyncFormatEnv *env, OSyncObjFormat *format) +osync_bool osync_format_env_register_objformat(OSyncFormatEnv *env, OSyncObjFormat *format, OSyncError **error) { osync_assert(env); osync_assert(format); env->objformats = osync_list_append(env->objformats, format); osync_objformat_ref(format); + + return TRUE; } OSyncObjFormat *osync_format_env_find_objformat(OSyncFormatEnv *env, const char *name) @@ -852,7 +854,7 @@ return osync_list_copy(env->objformats); } -void osync_format_env_register_converter(OSyncFormatEnv *env, OSyncFormatConverter *converter, OSyncError **error) +osync_bool osync_format_env_register_converter(OSyncFormatEnv *env, OSyncFormatConverter *converter, OSyncError **error) { osync_assert(env); osync_assert(converter); @@ -863,13 +865,18 @@ OSyncFormatConverter *conv = osync_converter_new_detector(osync_converter_get_targetformat(converter), osync_converter_get_sourceformat(converter), NULL, error); if (!conv) - return; + goto error; env->converters = osync_list_append(env->converters, conv); } env->converters = osync_list_append(env->converters, converter); osync_converter_ref(converter); + + return TRUE; + +error: + return FALSE; } OSyncFormatConverter *osync_format_env_find_converter(OSyncFormatEnv *env, OSyncObjFormat *sourceformat, OSyncObjFormat *targetformat) @@ -933,13 +940,15 @@ return osync_list_copy(env->converters); } -void osync_format_env_register_caps_converter(OSyncFormatEnv *env, OSyncCapsConverter *converter, OSyncError **error) +osync_bool osync_format_env_register_caps_converter(OSyncFormatEnv *env, OSyncCapsConverter *converter, OSyncError **error) { osync_assert(env); osync_assert(converter); env->caps_converters = osync_list_append(env->caps_converters, converter); osync_caps_converter_ref(converter); + + return TRUE; } OSyncCapsConverter *osync_format_env_find_caps_converter(OSyncFormatEnv *env, const char *sourcecapsformat, const char *targetcapsformat) @@ -987,13 +996,15 @@ return r; } -void osync_format_env_register_filter(OSyncFormatEnv *env, OSyncCustomFilter *filter) +osync_bool osync_format_env_register_filter(OSyncFormatEnv *env, OSyncCustomFilter *filter, OSyncError **error) { osync_assert(env); osync_assert(filter); env->custom_filters = osync_list_append(env->custom_filters, filter); osync_custom_filter_ref(filter); + + return TRUE; } unsigned int osync_format_env_num_filters(OSyncFormatEnv *env) @@ -1009,13 +1020,15 @@ } -void osync_format_env_register_merger(OSyncFormatEnv *env, OSyncMerger *merger) +osync_bool osync_format_env_register_merger(OSyncFormatEnv *env, OSyncMerger *merger, OSyncError **error) { osync_assert(env); osync_assert(merger); env->mergers = osync_list_append(env->mergers, merger); osync_merger_ref(merger); + + return TRUE; } Modified: trunk/opensync/format/opensync_format_env.h ============================================================================== --- trunk/opensync/format/opensync_format_env.h Thu Sep 17 01:30:03 2009 (r5771) +++ trunk/opensync/format/opensync_format_env.h Thu Sep 17 02:15:23 2009 (r5772) @@ -87,9 +87,11 @@ * * @param env Pointer to the environment * @param format Pointer ot the Object Format which sould be registred + * @param error The location to return a error to + * @returns TRUE if successful, FALSE otherwise * */ -OSYNC_EXPORT void osync_format_env_register_objformat(OSyncFormatEnv *env, OSyncObjFormat *format); +OSYNC_EXPORT osync_bool osync_format_env_register_objformat(OSyncFormatEnv *env, OSyncObjFormat *format, OSyncError **error); /** @brief Finds the object format with the given name * @@ -116,8 +118,9 @@ * @param env The format environment * @param converter Pointer of the Format Converter or Detector * @param error An OSyncError + * @returns TRUE on success, or FALSE */ -OSYNC_EXPORT void osync_format_env_register_converter(OSyncFormatEnv *env, OSyncFormatConverter *converter, OSyncError **error); +OSYNC_EXPORT osync_bool osync_format_env_register_converter(OSyncFormatEnv *env, OSyncFormatConverter *converter, OSyncError **error); /** @brief Finds first converter with the given source and target format * @@ -146,9 +149,11 @@ * * @param env The format environment * @param converter Pointer of the Capabilities Converter - * @param error An OSyncError + * @param error The location to return a error to + * @returns TRUE if successful, FALSE otherwise + */ -OSYNC_EXPORT void osync_format_env_register_caps_converter(OSyncFormatEnv *env, OSyncCapsConverter *converter, OSyncError **error); +OSYNC_EXPORT osync_bool osync_format_env_register_caps_converter(OSyncFormatEnv *env, OSyncCapsConverter *converter, OSyncError **error); /** @brief Finds first capabilities converter with the given source and target capsformat * @@ -281,8 +286,10 @@ * * @param env The format environment * @param merger Pointer of the merger + * @param error The location to return a error to + * @returns TRUE if successful, FALSE otherwise */ -OSYNC_EXPORT void osync_format_env_register_merger(OSyncFormatEnv *env, OSyncMerger *merger); +OSYNC_EXPORT osync_bool osync_format_env_register_merger(OSyncFormatEnv *env, OSyncMerger *merger, OSyncError **error); OSYNC_EXPORT OSyncMerger *osync_format_env_find_merger(OSyncFormatEnv *env, const char *objformat, const char *capsformat); Modified: trunk/opensync/format/opensync_format_env_internals.h ============================================================================== --- trunk/opensync/format/opensync_format_env_internals.h Thu Sep 17 01:30:03 2009 (r5771) +++ trunk/opensync/format/opensync_format_env_internals.h Thu Sep 17 02:15:23 2009 (r5772) @@ -94,9 +94,11 @@ * * @param env The format environment * @param filter Pointer of Custom Filter to register + * @param error The location to return a error to + * @returns TRUE if successful, FALSE otherwise * */ -OSYNC_TEST_EXPORT void osync_format_env_register_filter(OSyncFormatEnv *env, OSyncCustomFilter *filter); +OSYNC_TEST_EXPORT osync_bool osync_format_env_register_filter(OSyncFormatEnv *env, OSyncCustomFilter *filter, OSyncError **error); /** @brief Returns the number of available filters * Modified: trunk/opensync/plugin/opensync_plugin_env.c ============================================================================== --- trunk/opensync/plugin/opensync_plugin_env.c Thu Sep 17 01:30:03 2009 (r5771) +++ trunk/opensync/plugin/opensync_plugin_env.c Thu Sep 17 02:15:23 2009 (r5772) @@ -139,13 +139,15 @@ return FALSE; } -void osync_plugin_env_register_plugin(OSyncPluginEnv *env, OSyncPlugin *plugin) +osync_bool osync_plugin_env_register_plugin(OSyncPluginEnv *env, OSyncPlugin *plugin, OSyncError **error) { osync_assert(env); osync_assert(plugin); env->plugins = osync_list_append(env->plugins, plugin); osync_plugin_ref(plugin); + + return TRUE; } osync_bool osync_plugin_env_load_module(OSyncPluginEnv *env, const char *filename, OSyncError **error) Modified: trunk/opensync/plugin/opensync_plugin_env.h ============================================================================== --- trunk/opensync/plugin/opensync_plugin_env.h Thu Sep 17 01:30:03 2009 (r5771) +++ trunk/opensync/plugin/opensync_plugin_env.h Thu Sep 17 02:15:23 2009 (r5772) @@ -86,9 +86,11 @@ * * @param env Pointer to a plugin environment * @param plugin Pointer to plugin which should get added to environment + * @param error Pointer to a error struct to return a error + * @returns TRUE on success, FALSE otherwise * */ -OSYNC_EXPORT void osync_plugin_env_register_plugin(OSyncPluginEnv *env, OSyncPlugin *plugin); +OSYNC_EXPORT osync_bool osync_plugin_env_register_plugin(OSyncPluginEnv *env, OSyncPlugin *plugin, OSyncError **error); /** @brief Finds the plugin with the given name * Modified: trunk/tests/engine-tests/check_engine.c ============================================================================== --- trunk/tests/engine-tests/check_engine.c Thu Sep 17 01:30:03 2009 (r5771) +++ trunk/tests/engine-tests/check_engine.c Thu Sep 17 02:15:23 2009 (r5772) @@ -327,10 +327,10 @@ engine->pluginenv = osync_plugin_env_new(NULL); if (debug->plugin) - osync_plugin_env_register_plugin(engine->pluginenv, debug->plugin); + osync_plugin_env_register_plugin(engine->pluginenv, debug->plugin, NULL); if (debug->plugin2) - osync_plugin_env_register_plugin(engine->pluginenv, debug->plugin2); + osync_plugin_env_register_plugin(engine->pluginenv, debug->plugin2, NULL); } START_TEST (engine_sync) Modified: trunk/tests/engine-tests/check_engine_error.c ============================================================================== --- trunk/tests/engine-tests/check_engine_error.c Thu Sep 17 01:30:03 2009 (r5771) +++ trunk/tests/engine-tests/check_engine_error.c Thu Sep 17 02:15:23 2009 (r5772) @@ -271,10 +271,10 @@ engine->pluginenv = osync_plugin_env_new(NULL); if (debug->plugin) - osync_plugin_env_register_plugin(engine->pluginenv, debug->plugin); + osync_plugin_env_register_plugin(engine->pluginenv, debug->plugin, NULL); if (debug->plugin2) - osync_plugin_env_register_plugin(engine->pluginenv, debug->plugin2); + osync_plugin_env_register_plugin(engine->pluginenv, debug->plugin2, NULL); } START_TEST (engine_error_single_init_error) Modified: trunk/tests/format-tests/check_conv.c ============================================================================== --- trunk/tests/format-tests/check_conv.c Thu Sep 17 01:30:03 2009 (r5771) +++ trunk/tests/format-tests/check_conv.c Thu Sep 17 02:15:23 2009 (r5772) @@ -33,7 +33,7 @@ fail_unless(format != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format); + osync_format_env_register_objformat(env, format, NULL); osync_objformat_unref(format); @@ -58,7 +58,7 @@ fail_unless(osync_format_env_num_objformats(env) == 0, NULL); - osync_format_env_register_objformat(env, format); + osync_format_env_register_objformat(env, format, NULL); osync_objformat_unref(format); fail_unless(osync_format_env_num_objformats(env) == 1, NULL); @@ -83,7 +83,7 @@ fail_unless(format != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format); + osync_format_env_register_objformat(env, format, NULL); osync_objformat_unref(format); fail_unless(osync_format_env_find_objformat(env, "format") == format, NULL); @@ -107,7 +107,7 @@ fail_unless(format != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format); + osync_format_env_register_objformat(env, format, NULL); osync_objformat_unref(format); fail_unless(osync_format_env_find_objformat(env, "format2") == NULL, NULL); @@ -138,12 +138,12 @@ OSyncObjFormat *format1 = osync_objformat_new("format1", "objtype", &error); fail_unless(format1 != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format1); + osync_format_env_register_objformat(env, format1, NULL); OSyncObjFormat *format2 = osync_objformat_new("format2", "objtype", &error); fail_unless(format2 != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format2); + osync_format_env_register_objformat(env, format2, NULL); OSyncFormatConverter *converter = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format2, convert_func, &error); fail_unless(converter != NULL, NULL); @@ -174,12 +174,12 @@ OSyncObjFormat *format1 = osync_objformat_new("format1", "objtype", &error); fail_unless(format1 != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format1); + osync_format_env_register_objformat(env, format1, NULL); OSyncObjFormat *format2 = osync_objformat_new("format2", "objtype", &error); fail_unless(format2 != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format2); + osync_format_env_register_objformat(env, format2, NULL); OSyncFormatConverter *converter = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format2, convert_func, &error); fail_unless(converter != NULL, NULL); @@ -215,12 +215,12 @@ OSyncObjFormat *format1 = osync_objformat_new("format1", "objtype", &error); fail_unless(format1 != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format1); + osync_format_env_register_objformat(env, format1, NULL); OSyncObjFormat *format2 = osync_objformat_new("format2", "objtype", &error); fail_unless(format2 != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format2); + osync_format_env_register_objformat(env, format2, NULL); OSyncFormatConverter *converter = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format2, convert_func, &error); fail_unless(converter != NULL, NULL); @@ -252,17 +252,17 @@ OSyncObjFormat *format1 = osync_objformat_new("format1", "objtype", &error); fail_unless(format1 != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format1); + osync_format_env_register_objformat(env, format1, NULL); OSyncObjFormat *format2 = osync_objformat_new("format2", "objtype", &error); fail_unless(format2 != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format2); + osync_format_env_register_objformat(env, format2, NULL); OSyncObjFormat *format3 = osync_objformat_new("format3", "objtype", &error); fail_unless(format3 != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format3); + osync_format_env_register_objformat(env, format3, NULL); OSyncFormatConverter *converter = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format2, convert_func, &error); fail_unless(converter != NULL, NULL); @@ -302,7 +302,7 @@ fail_unless(filter != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_filter(env, filter); + osync_format_env_register_filter(env, filter, NULL); osync_custom_filter_unref(filter); @@ -327,7 +327,7 @@ fail_unless(osync_format_env_num_filters(env) == 0, NULL); - osync_format_env_register_filter(env, filter); + osync_format_env_register_filter(env, filter, NULL); fail_unless(osync_format_env_num_filters(env) == 1, NULL); fail_unless(osync_format_env_nth_filter(env, 0) == filter, NULL); @@ -381,13 +381,13 @@ OSyncObjFormat *format1 = osync_objformat_new("format1", "objtype", &error); fail_unless(format1 != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format1); + osync_format_env_register_objformat(env, format1, NULL); osync_objformat_set_destroy_func(format1, format_simple_destroy); OSyncObjFormat *format2 = osync_objformat_new("format2", "objtype", &error); fail_unless(format2 != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format2); + osync_format_env_register_objformat(env, format2, NULL); osync_objformat_set_destroy_func(format2, format_simple_destroy); OSyncFormatConverter *converter = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format2, convert_func, &error); @@ -444,19 +444,19 @@ fail_unless(format1 != NULL, NULL); fail_unless(error == NULL, NULL); osync_objformat_set_destroy_func(format1, format_simple_destroy); - osync_format_env_register_objformat(env, format1); + osync_format_env_register_objformat(env, format1, NULL); OSyncObjFormat *format2 = osync_objformat_new("format2", "objtype", &error); fail_unless(format2 != NULL, NULL); fail_unless(error == NULL, NULL); osync_objformat_set_destroy_func(format2, format_simple_destroy); - osync_format_env_register_objformat(env, format2); + osync_format_env_register_objformat(env, format2, NULL); OSyncObjFormat *format3 = osync_objformat_new("format3", "objtype", &error); fail_unless(format3 != NULL, NULL); fail_unless(error == NULL, NULL); osync_objformat_set_destroy_func(format3, format_simple_destroy); - osync_format_env_register_objformat(env, format3); + osync_format_env_register_objformat(env, format3, NULL); OSyncFormatConverter *converter1 = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format2, convert_func, &error); fail_unless(converter1 != NULL, NULL); @@ -508,17 +508,17 @@ OSyncObjFormat *format1 = osync_objformat_new("format1", "objtype", &error); fail_unless(format1 != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format1); + osync_format_env_register_objformat(env, format1, NULL); OSyncObjFormat *format2 = osync_objformat_new("format2", "objtype", &error); fail_unless(format2 != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format2); + osync_format_env_register_objformat(env, format2, NULL); OSyncObjFormat *format3 = osync_objformat_new("format3", "objtype", &error); fail_unless(format3 != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format3); + osync_format_env_register_objformat(env, format3, NULL); OSyncFormatConverter *converter1 = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format2, convert_func, &error); fail_unless(converter1 != NULL, NULL); @@ -566,25 +566,25 @@ fail_unless(format1 != NULL, NULL); fail_unless(error == NULL, NULL); osync_objformat_set_destroy_func(format1, format_simple_destroy); - osync_format_env_register_objformat(env, format1); + osync_format_env_register_objformat(env, format1, NULL); OSyncObjFormat *format2 = osync_objformat_new("format2", "objtype", &error); fail_unless(format2 != NULL, NULL); fail_unless(error == NULL, NULL); osync_objformat_set_destroy_func(format2, format_simple_destroy); - osync_format_env_register_objformat(env, format2); + osync_format_env_register_objformat(env, format2, NULL); OSyncObjFormat *format3 = osync_objformat_new("format3", "objtype", &error); fail_unless(format3 != NULL, NULL); fail_unless(error == NULL, NULL); osync_objformat_set_destroy_func(format3, format_simple_destroy); - osync_format_env_register_objformat(env, format3); + osync_format_env_register_objformat(env, format3, NULL); OSyncObjFormat *format4 = osync_objformat_new("format4", "objtype", &error); fail_unless(format4 != NULL, NULL); fail_unless(error == NULL, NULL); osync_objformat_set_destroy_func(format4, format_simple_destroy); - osync_format_env_register_objformat(env, format4); + osync_format_env_register_objformat(env, format4, NULL); OSyncFormatConverter *converter1 = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format2, convert_func, &error); fail_unless(converter1 != NULL, NULL); @@ -649,25 +649,25 @@ fail_unless(format1 != NULL, NULL); fail_unless(error == NULL, NULL); osync_objformat_set_destroy_func(format1, format_simple_destroy); - osync_format_env_register_objformat(env, format1); + osync_format_env_register_objformat(env, format1, NULL); OSyncObjFormat *format2 = osync_objformat_new("format2", "objtype", &error); fail_unless(format2 != NULL, NULL); fail_unless(error == NULL, NULL); osync_objformat_set_destroy_func(format2, format_simple_destroy); - osync_format_env_register_objformat(env, format2); + osync_format_env_register_objformat(env, format2, NULL); OSyncObjFormat *format3 = osync_objformat_new("format3", "objtype", &error); fail_unless(format3 != NULL, NULL); fail_unless(error == NULL, NULL); osync_objformat_set_destroy_func(format3, format_simple_destroy); - osync_format_env_register_objformat(env, format3); + osync_format_env_register_objformat(env, format3, NULL); OSyncObjFormat *format4 = osync_objformat_new("format4", "objtype", &error); fail_unless(format4 != NULL, NULL); fail_unless(error == NULL, NULL); osync_objformat_set_destroy_func(format4, format_simple_destroy); - osync_format_env_register_objformat(env, format4); + osync_format_env_register_objformat(env, format4, NULL); OSyncFormatConverter *converter1 = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format2, convert_func, &error); fail_unless(converter1 != NULL, NULL); @@ -731,22 +731,22 @@ OSyncObjFormat *format1 = osync_objformat_new("format1", "objtype", &error); fail_unless(format1 != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format1); + osync_format_env_register_objformat(env, format1, NULL); OSyncObjFormat *format2 = osync_objformat_new("format2", "objtype", &error); fail_unless(format2 != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format2); + osync_format_env_register_objformat(env, format2, NULL); OSyncObjFormat *format3 = osync_objformat_new("format3", "objtype", &error); fail_unless(format3 != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format3); + osync_format_env_register_objformat(env, format3, NULL); OSyncObjFormat *format4 = osync_objformat_new("format4", "objtype", &error); fail_unless(format4 != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format4); + osync_format_env_register_objformat(env, format4, NULL); OSyncFormatConverter *converter1 = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format2, convert_func, &error); fail_unless(converter1 != NULL, NULL); @@ -801,49 +801,49 @@ fail_unless(format1 != NULL, NULL); fail_unless(error == NULL, NULL); osync_objformat_set_destroy_func(format1, format_simple_destroy); - osync_format_env_register_objformat(env, format1); + osync_format_env_register_objformat(env, format1, NULL); OSyncObjFormat *format2 = osync_objformat_new("format2", "objtype", &error); fail_unless(format2 != NULL, NULL); fail_unless(error == NULL, NULL); osync_objformat_set_destroy_func(format2, format_simple_destroy); - osync_format_env_register_objformat(env, format2); + osync_format_env_register_objformat(env, format2, NULL); OSyncObjFormat *format3 = osync_objformat_new("format3", "objtype", &error); fail_unless(format3 != NULL, NULL); fail_unless(error == NULL, NULL); osync_objformat_set_destroy_func(format3, format_simple_destroy); - osync_format_env_register_objformat(env, format3); + osync_format_env_register_objformat(env, format3, NULL); OSyncObjFormat *format4 = osync_objformat_new("format4", "objtype", &error); fail_unless(format4 != NULL, NULL); fail_unless(error == NULL, NULL); osync_objformat_set_destroy_func(format4, format_simple_destroy); - osync_format_env_register_objformat(env, format4); + osync_format_env_register_objformat(env, format4, NULL); OSyncObjFormat *format5 = osync_objformat_new("format5", "objtype", &error); fail_unless(format5 != NULL, NULL); fail_unless(error == NULL, NULL); osync_objformat_set_destroy_func(format5, format_simple_destroy); - osync_format_env_register_objformat(env, format5); + osync_format_env_register_objformat(env, format5, NULL); OSyncObjFormat *format6 = osync_objformat_new("format6", "objtype", &error); fail_unless(format6 != NULL, NULL); fail_unless(error == NULL, NULL); osync_objformat_set_destroy_func(format6, format_simple_destroy); - osync_format_env_register_objformat(env, format6); + osync_format_env_register_objformat(env, format6, NULL); OSyncObjFormat *format7 = osync_objformat_new("format7", "objtype", &error); fail_unless(format7 != NULL, NULL); fail_unless(error == NULL, NULL); osync_objformat_set_destroy_func(format7, format_simple_destroy); - osync_format_env_register_objformat(env, format7); + osync_format_env_register_objformat(env, format7, NULL); OSyncObjFormat *format8 = osync_objformat_new("format8", "objtype", &error); fail_unless(format8 != NULL, NULL); fail_unless(error == NULL, NULL); osync_objformat_set_destroy_func(format8, format_simple_destroy); - osync_format_env_register_objformat(env, format8); + osync_format_env_register_objformat(env, format8, NULL); OSyncFormatConverter *converter1 = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format2, convert_func, &error); fail_unless(converter1 != NULL, NULL); @@ -942,17 +942,17 @@ OSyncObjFormat *format1 = osync_objformat_new("format1", "objtype", &error); fail_unless(format1 != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format1); + osync_format_env_register_objformat(env, format1, NULL); OSyncObjFormat *format2 = osync_objformat_new("format2", "objtype", &error); fail_unless(format2 != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format2); + osync_format_env_register_objformat(env, format2, NULL); OSyncObjFormat *format3 = osync_objformat_new("format3", "objtype", &error); fail_unless(format3 != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format3); + osync_format_env_register_objformat(env, format3, NULL); OSyncFormatConverter *converter1 = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format2, convert_func, &error); fail_unless(converter1 != NULL, NULL); @@ -1006,22 +1006,22 @@ OSyncObjFormat *format1 = osync_objformat_new("format1", "objtype", &error); fail_unless(format1 != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format1); + osync_format_env_register_objformat(env, format1, NULL); OSyncObjFormat *format2 = osync_objformat_new("format2", "objtype", &error); fail_unless(format2 != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format2); + osync_format_env_register_objformat(env, format2, NULL); OSyncObjFormat *format3 = osync_objformat_new("format3", "objtype", &error); fail_unless(format3 != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format3); + osync_format_env_register_objformat(env, format3, NULL); OSyncObjFormat *format4 = osync_objformat_new("format4", "objtype", &error); fail_unless(format4 != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format4); + osync_format_env_register_objformat(env, format4, NULL); OSyncFormatConverter *converter1 = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format2, convert_func, &error); fail_unless(converter1 != NULL, NULL); @@ -1083,31 +1083,31 @@ fail_unless(format1 != NULL, NULL); fail_unless(error == NULL, NULL); osync_objformat_set_destroy_func(format1, format_simple_destroy); - osync_format_env_register_objformat(env, format1); + osync_format_env_register_objformat(env, format1, NULL); OSyncObjFormat *format2 = osync_objformat_new("format2", "objtype", &error); fail_unless(format2 != NULL, NULL); fail_unless(error == NULL, NULL); osync_objformat_set_destroy_func(format2, format_simple_destroy); - osync_format_env_register_objformat(env, format2); + osync_format_env_register_objformat(env, format2, NULL); OSyncObjFormat *format3 = osync_objformat_new("format3", "objtype", &error); fail_unless(format3 != NULL, NULL); fail_unless(error == NULL, NULL); osync_objformat_set_destroy_func(format3, format_simple_destroy); - osync_format_env_register_objformat(env, format3); + osync_format_env_register_objformat(env, format3, NULL); OSyncObjFormat *format4 = osync_objformat_new("format4", "objtype", &error); fail_unless(format4 != NULL, NULL); fail_unless(error == NULL, NULL); osync_objformat_set_destroy_func(format4, format_simple_destroy); - osync_format_env_register_objformat(env, format4); + osync_format_env_register_objformat(env, format4, NULL); OSyncObjFormat *format5 = osync_objformat_new("format5", "objtype", &error); fail_unless(format5 != NULL, NULL); fail_unless(error == NULL, NULL); osync_objformat_set_destroy_func(format5, format_simple_destroy); - osync_format_env_register_objformat(env, format5); + osync_format_env_register_objformat(env, format5, NULL); OSyncFormatConverter *converter1 = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format2, convert_func, &error); fail_unless(converter1 != NULL, NULL); @@ -1183,31 +1183,31 @@ fail_unless(format1 != NULL, NULL); fail_unless(error == NULL, NULL); osync_objformat_set_destroy_func(format1, format_simple_destroy); - osync_format_env_register_objformat(env, format1); + osync_format_env_register_objformat(env, format1, NULL); OSyncObjFormat *format2 = osync_objformat_new("format2", "objtype", &error); fail_unless(format2 != NULL, NULL); fail_unless(error == NULL, NULL); osync_objformat_set_destroy_func(format2, format_simple_destroy); - osync_format_env_register_objformat(env, format2); + osync_format_env_register_objformat(env, format2, NULL); OSyncObjFormat *format3 = osync_objformat_new("format3", "objtype", &error); fail_unless(format3 != NULL, NULL); fail_unless(error == NULL, NULL); osync_objformat_set_destroy_func(format3, format_simple_destroy); - osync_format_env_register_objformat(env, format3); + osync_format_env_register_objformat(env, format3, NULL); OSyncObjFormat *format4 = osync_objformat_new("format4", "objtype", &error); fail_unless(format4 != NULL, NULL); fail_unless(error == NULL, NULL); osync_objformat_set_destroy_func(format4, format_simple_destroy); - osync_format_env_register_objformat(env, format4); + osync_format_env_register_objformat(env, format4, NULL); OSyncObjFormat *format5 = osync_objformat_new("format5", "objtype", &error); fail_unless(format5 != NULL, NULL); fail_unless(error == NULL, NULL); osync_objformat_set_destroy_func(format5, format_simple_destroy); - osync_format_env_register_objformat(env, format5); + osync_format_env_register_objformat(env, format5, NULL); OSyncFormatConverter *converter1 = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format2, convert_func, &error); fail_unless(converter1 != NULL, NULL); @@ -1328,19 +1328,19 @@ OSyncObjFormat *format1 = osync_objformat_new("F1", "O1", &error); fail_unless(format1 != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format1); + osync_format_env_register_objformat(env, format1, NULL); osync_objformat_set_destroy_func(format1, format_simple_destroy); OSyncObjFormat *format2 = osync_objformat_new("F2", "O1", &error); fail_unless(format2 != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format2); + osync_format_env_register_objformat(env, format2, NULL); osync_objformat_set_destroy_func(format2, format_simple_destroy); OSyncObjFormat *format3 = osync_objformat_new("F3", "O1", &error); fail_unless(format3 != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format3); + osync_format_env_register_objformat(env, format3, NULL); osync_objformat_set_destroy_func(format3, format_simple_destroy); OSyncFormatConverter *converter1 = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format2, convert_addtest, &error); @@ -1390,19 +1390,19 @@ fail_unless(format1 != NULL, NULL); fail_unless(error == NULL, NULL); osync_objformat_set_destroy_func(format1, format_simple_destroy); - osync_format_env_register_objformat(env, format1); + osync_format_env_register_objformat(env, format1, NULL); OSyncObjFormat *format2 = osync_objformat_new("F2", "O1", &error); fail_unless(format2 != NULL, NULL); fail_unless(error == NULL, NULL); osync_objformat_set_destroy_func(format2, format_simple_destroy); - osync_format_env_register_objformat(env, format2); + osync_format_env_register_objformat(env, format2, NULL); OSyncObjFormat *format3 = osync_objformat_new("F3", "O1", &error); fail_unless(format3 != NULL, NULL); fail_unless(error == NULL, NULL); osync_objformat_set_destroy_func(format3, format_simple_destroy); - osync_format_env_register_objformat(env, format3); + osync_format_env_register_objformat(env, format3, NULL); OSyncFormatConverter *converter1 = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format2, convert_addtest, &error); fail_unless(converter1 != NULL, NULL); @@ -1480,19 +1480,19 @@ fail_unless(format1 != NULL, NULL); fail_unless(error == NULL, NULL); osync_objformat_set_destroy_func(format1, format_simple_destroy); - osync_format_env_register_objformat(env, format1); + osync_format_env_register_objformat(env, format1, NULL); OSyncObjFormat *format2 = osync_objformat_new("F2", "O1", &error); fail_unless(format2 != NULL, NULL); fail_unless(error == NULL, NULL); osync_objformat_set_destroy_func(format2, format_simple_destroy); - osync_format_env_register_objformat(env, format2); + osync_format_env_register_objformat(env, format2, NULL); OSyncObjFormat *format3 = osync_objformat_new("F3", "O1", &error); fail_unless(format3 != NULL, NULL); fail_unless(error == NULL, NULL); osync_objformat_set_destroy_func(format3, format_simple_destroy); - osync_format_env_register_objformat(env, format3); + osync_format_env_register_objformat(env, format3, NULL); OSyncFormatConverter *converter1 = osync_converter_new(OSYNC_CONVERTER_DECAP, format1, format2, convert_addtest, &error); fail_unless(converter1 != NULL, NULL); @@ -1580,27 +1580,27 @@ fail_unless(error == NULL, NULL); OSyncObjFormat *format1 = osync_objformat_new("F1", "O1", &error); - osync_format_env_register_objformat(env, format1); + osync_format_env_register_objformat(env, format1, NULL); osync_objformat_set_destroy_func(format1, format_simple_destroy); OSyncObjFormat *format2 = osync_objformat_new("F2", "O1", &error); - osync_format_env_register_objformat(env, format2); + osync_format_env_register_objformat(env, format2, NULL); osync_objformat_set_destroy_func(format2, format_simple_destroy); OSyncObjFormat *format3 = osync_objformat_new("F3", "O1", &error); - osync_format_env_register_objformat(env, format3); + osync_format_env_register_objformat(env, format3, NULL); osync_objformat_set_destroy_func(format3, format_simple_destroy); OSyncObjFormat *format4 = osync_objformat_new("F4", "O1", &error); - osync_format_env_register_objformat(env, format4); + osync_format_env_register_objformat(env, format4, NULL); osync_objformat_set_destroy_func(format4, format_simple_destroy); OSyncObjFormat *format5 = osync_objformat_new("F5", "O1", &error); - osync_format_env_register_objformat(env, format5); + osync_format_env_register_objformat(env, format5, NULL); osync_objformat_set_destroy_func(format5, format_simple_destroy); OSyncObjFormat *format6 = osync_objformat_new("F6", "O1", &error); - osync_format_env_register_objformat(env, format6); + osync_format_env_register_objformat(env, format6, NULL); osync_objformat_set_destroy_func(format6, format_simple_destroy); /*** Detectors ***/ @@ -1717,19 +1717,19 @@ fail_unless(error == NULL, NULL); OSyncObjFormat *format1 = osync_objformat_new("F1", "O1", &error); - osync_format_env_register_objformat(env, format1); + osync_format_env_register_objformat(env, format1, NULL); osync_objformat_set_destroy_func(format1, format_simple_destroy); OSyncObjFormat *format2 = osync_objformat_new("F2", "O1", &error); - osync_format_env_register_objformat(env, format2); + osync_format_env_register_objformat(env, format2, NULL); osync_objformat_set_destroy_func(format2, format_simple_destroy); OSyncObjFormat *format3 = osync_objformat_new("F3", "O1", &error); - osync_format_env_register_objformat(env, format3); + osync_format_env_register_objformat(env, format3, NULL); osync_objformat_set_destroy_func(format3, format_simple_destroy); OSyncObjFormat *format4 = osync_objformat_new("F4", "O1", &error); - osync_format_env_register_objformat(env, format4); + osync_format_env_register_objformat(env, format4, NULL); osync_objformat_set_destroy_func(format4, format_simple_destroy); /*** Detectors ***/ @@ -1848,23 +1848,23 @@ fail_unless(error == NULL, NULL); OSyncObjFormat *format1 = osync_objformat_new("F1", "O1", &error); - osync_format_env_register_objformat(env, format1); + osync_format_env_register_objformat(env, format1, NULL); osync_objformat_set_destroy_func(format1, format_simple_destroy); OSyncObjFormat *format2 = osync_objformat_new("F2", "O1", &error); - osync_format_env_register_objformat(env, format2); + osync_format_env_register_objformat(env, format2, NULL); osync_objformat_set_destroy_func(format2, format_simple_destroy); OSyncObjFormat *format3 = osync_objformat_new("F3", "O1", &error); - osync_format_env_register_objformat(env, format3); + osync_format_env_register_objformat(env, format3, NULL); osync_objformat_set_destroy_func(format3, format_simple_destroy); OSyncObjFormat *format4 = osync_objformat_new("F4", "O1", &error); - osync_format_env_register_objformat(env, format4); + osync_format_env_register_objformat(env, format4, NULL); osync_objformat_set_destroy_func(format4, format_simple_destroy); OSyncObjFormat *format5 = osync_objformat_new("F5", "O1", &error); - osync_format_env_register_objformat(env, format5); + osync_format_env_register_objformat(env, format5, NULL); osync_objformat_set_destroy_func(format5, format_simple_destroy); /*** Detectors ***/ @@ -1961,31 +1961,31 @@ fail_unless(error == NULL, NULL); OSyncObjFormat *format1 = osync_objformat_new("F1", "F", &error); - osync_format_env_register_objformat(env, format1); + osync_format_env_register_objformat(env, format1, NULL); osync_objformat_set_destroy_func(format1, format_simple_destroy); OSyncObjFormat *format2 = osync_objformat_new("F2", "F", &error); - osync_format_env_register_objformat(env, format2); + osync_format_env_register_objformat(env, format2, NULL); osync_objformat_set_destroy_func(format2, format_simple_destroy); OSyncObjFormat *format3 = osync_objformat_new("F3", "F", &error); - osync_format_env_register_objformat(env, format3); + osync_format_env_register_objformat(env, format3, NULL); osync_objformat_set_destroy_func(format3, format_simple_destroy); OSyncObjFormat *format4 = osync_objformat_new("F4", "F", &error); - osync_format_env_register_objformat(env, format4); + osync_format_env_register_objformat(env, format4, NULL); osync_objformat_set_destroy_func(format4, format_simple_destroy); OSyncObjFormat *format5 = osync_objformat_new("F5", "F", &error); - osync_format_env_register_objformat(env, format5); + osync_format_env_register_objformat(env, format5, NULL); osync_objformat_set_destroy_func(format5, format_simple_destroy); OSyncObjFormat *format6 = osync_objformat_new("F6", "F", &error); - osync_format_env_register_objformat(env, format6); + osync_format_env_register_objformat(env, format6, NULL); osync_objformat_set_destroy_func(format6, format_simple_destroy); OSyncObjFormat *format_g1 = osync_objformat_new("G1", "G", &error); - osync_format_env_register_objformat(env, format_g1); + osync_format_env_register_objformat(env, format_g1, NULL); osync_objformat_set_destroy_func(format_g1, format_simple_destroy); /*** Converter ***/ @@ -2070,31 +2070,31 @@ fail_unless(error == NULL, NULL); OSyncObjFormat *format1 = osync_objformat_new("F1", "F", &error); - osync_format_env_register_objformat(env, format1); + osync_format_env_register_objformat(env, format1, NULL); osync_objformat_set_destroy_func(format1, format_simple_destroy); OSyncObjFormat *format2 = osync_objformat_new("F2", "F", &error); - osync_format_env_register_objformat(env, format2); + osync_format_env_register_objformat(env, format2, NULL); osync_objformat_set_destroy_func(format2, format_simple_destroy); OSyncObjFormat *format3 = osync_objformat_new("F3", "F", &error); - osync_format_env_register_objformat(env, format3); + osync_format_env_register_objformat(env, format3, NULL); osync_objformat_set_destroy_func(format3, format_simple_destroy); OSyncObjFormat *format4 = osync_objformat_new("F4", "F", &error); - osync_format_env_register_objformat(env, format4); + osync_format_env_register_objformat(env, format4, NULL); osync_objformat_set_destroy_func(format4, format_simple_destroy); OSyncObjFormat *format5 = osync_objformat_new("F5", "F", &error); - osync_format_env_register_objformat(env, format5); + osync_format_env_register_objformat(env, format5, NULL); osync_objformat_set_destroy_func(format5, format_simple_destroy); OSyncObjFormat *format6 = osync_objformat_new("F6", "F", &error); - osync_format_env_register_objformat(env, format6); + osync_format_env_register_objformat(env, format6, NULL); osync_objformat_set_destroy_func(format6, format_simple_destroy); OSyncObjFormat *format_g1 = osync_objformat_new("G1", "G", &error); - osync_format_env_register_objformat(env, format_g1); + osync_format_env_register_objformat(env, format_g1, NULL); osync_objformat_set_destroy_func(format_g1, format_simple_destroy); /*** Converter ***/ @@ -2164,15 +2164,15 @@ fail_unless(error == NULL, NULL); OSyncObjFormat *format1 = osync_objformat_new("F1", "O1", &error); - osync_format_env_register_objformat(env, format1); + osync_format_env_register_objformat(env, format1, NULL); osync_objformat_set_destroy_func(format1, format_simple_destroy); OSyncObjFormat *format2 = osync_objformat_new("F2", "O1", &error); - osync_format_env_register_objformat(env, format2); + osync_format_env_register_objformat(env, format2, NULL); osync_objformat_set_destroy_func(format2, format_simple_destroy); OSyncObjFormat *format3 = osync_objformat_new("F3", "O1", &error); - osync_format_env_register_objformat(env, format3); + osync_format_env_register_objformat(env, format3, NULL); osync_objformat_set_destroy_func(format3, format_simple_destroy); /*** Detectors ***/ @@ -2238,19 +2238,19 @@ fail_unless(error == NULL, NULL); OSyncObjFormat *format1 = osync_objformat_new("F1", "O1", &error); - osync_format_env_register_objformat(env, format1); + osync_format_env_register_objformat(env, format1, NULL); osync_objformat_set_destroy_func(format1, format_simple_destroy); OSyncObjFormat *format2 = osync_objformat_new("F2", "O1", &error); - osync_format_env_register_objformat(env, format2); + osync_format_env_register_objformat(env, format2, NULL); osync_objformat_set_destroy_func(format2, format_simple_destroy); OSyncObjFormat *format3 = osync_objformat_new("F3", "O1", &error); - osync_format_env_register_objformat(env, format3); + osync_format_env_register_objformat(env, format3, NULL); osync_objformat_set_destroy_func(format3, format_simple_destroy); OSyncObjFormat *format_plain = osync_objformat_new("plain", "O1", &error); - osync_format_env_register_objformat(env, format_plain); + osync_format_env_register_objformat(env, format_plain, NULL); osync_objformat_set_destroy_func(format_plain, format_simple_destroy); /*** Detectors ***/ @@ -2363,19 +2363,19 @@ fail_unless(error == NULL, NULL); OSyncObjFormat *format1 = osync_objformat_new("F1", "O1", &error); - osync_format_env_register_objformat(env, format1); + osync_format_env_register_objformat(env, format1, NULL); osync_objformat_set_destroy_func(format1, format_simple_destroy); OSyncObjFormat *format2 = osync_objformat_new("F2", "O1", &error); - osync_format_env_register_objformat(env, format2); + osync_format_env_register_objformat(env, format2, NULL); osync_objformat_set_destroy_func(format2, format_simple_destroy); OSyncObjFormat *format3 = osync_objformat_new("F3", "O1", &error); - osync_format_env_register_objformat(env, format3); + osync_format_env_register_objformat(env, format3, NULL); osync_objformat_set_destroy_func(format3, format_simple_destroy); OSyncObjFormat *format_plain = osync_objformat_new("plain", "O1", &error); - osync_format_env_register_objformat(env, format_plain); + osync_format_env_register_objformat(env, format_plain, NULL); osync_objformat_set_destroy_func(format_plain, format_simple_destroy); /*** Detectors ***/ Modified: trunk/tests/format-tests/check_format_env.c ============================================================================== --- trunk/tests/format-tests/check_format_env.c Thu Sep 17 01:30:03 2009 (r5771) +++ trunk/tests/format-tests/check_format_env.c Thu Sep 17 02:15:23 2009 (r5772) @@ -34,7 +34,7 @@ fail_unless(format != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format); + osync_format_env_register_objformat(env, format, NULL); osync_objformat_unref(format); @@ -59,7 +59,7 @@ fail_unless(osync_format_env_num_objformats(env) == 0, NULL); - osync_format_env_register_objformat(env, format); + osync_format_env_register_objformat(env, format, NULL); osync_objformat_unref(format); fail_unless(osync_format_env_num_objformats(env) == 1, NULL); @@ -84,7 +84,7 @@ fail_unless(format != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format); + osync_format_env_register_objformat(env, format, NULL); osync_objformat_unref(format); fail_unless(osync_format_env_find_objformat(env, "format") == format, NULL); @@ -108,7 +108,7 @@ fail_unless(format != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format); + osync_format_env_register_objformat(env, format, NULL); osync_objformat_unref(format); fail_unless(osync_format_env_find_objformat(env, "format2") == NULL, NULL); @@ -136,12 +136,12 @@ OSyncObjFormat *format1 = osync_objformat_new("format1", "objtype", &error); fail_unless(format1 != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format1); + osync_format_env_register_objformat(env, format1, NULL); OSyncObjFormat *format2 = osync_objformat_new("format2", "objtype", &error); fail_unless(format2 != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format2); + osync_format_env_register_objformat(env, format2, NULL); OSyncFormatConverter *converter = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format2, convert_func, &error); fail_unless(converter != NULL, NULL); @@ -172,12 +172,12 @@ OSyncObjFormat *format1 = osync_objformat_new("format1", "objtype", &error); fail_unless(format1 != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format1); + osync_format_env_register_objformat(env, format1, NULL); OSyncObjFormat *format2 = osync_objformat_new("format2", "objtype", &error); fail_unless(format2 != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format2); + osync_format_env_register_objformat(env, format2, NULL); OSyncFormatConverter *converter = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format2, convert_func, &error); fail_unless(converter != NULL, NULL); @@ -213,12 +213,12 @@ OSyncObjFormat *format1 = osync_objformat_new("format1", "objtype", &error); fail_unless(format1 != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format1); + osync_format_env_register_objformat(env, format1, NULL); OSyncObjFormat *format2 = osync_objformat_new("format2", "objtype", &error); fail_unless(format2 != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format2); + osync_format_env_register_objformat(env, format2, NULL); OSyncFormatConverter *converter = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format2, convert_func, &error); fail_unless(converter != NULL, NULL); @@ -250,17 +250,17 @@ OSyncObjFormat *format1 = osync_objformat_new("format1", "objtype", &error); fail_unless(format1 != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format1); + osync_format_env_register_objformat(env, format1, NULL); OSyncObjFormat *format2 = osync_objformat_new("format2", "objtype", &error); fail_unless(format2 != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format2); + osync_format_env_register_objformat(env, format2, NULL); OSyncObjFormat *format3 = osync_objformat_new("format3", "objtype", &error); fail_unless(format3 != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_objformat(env, format3); + osync_format_env_register_objformat(env, format3, NULL); OSyncFormatConverter *converter = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format2, convert_func, &error); fail_unless(converter != NULL, NULL); @@ -300,7 +300,7 @@ fail_unless(filter != NULL, NULL); fail_unless(error == NULL, NULL); - osync_format_env_register_filter(env, filter); + osync_format_env_register_filter(env, filter, NULL); osync_custom_filter_unref(filter); @@ -325,7 +325,7 @@ fail_unless(osync_format_env_num_filters(env) == 0, NULL); - osync_format_env_register_filter(env, filter); + osync_format_env_register_filter(env, filter, NULL); fail_unless(osync_format_env_num_filters(env) == 1, NULL); fail_unless(osync_format_env_nth_filter(env, 0) == filter, NULL); Modified: trunk/tests/mock-plugin/mock_format.c ============================================================================== --- trunk/tests/mock-plugin/mock_format.c Thu Sep 17 01:30:03 2009 (r5771) +++ trunk/tests/mock-plugin/mock_format.c Thu Sep 17 02:15:23 2009 (r5772) @@ -252,7 +252,7 @@ _format_set_functions(format); - osync_format_env_register_objformat(env, format); + osync_assert(osync_format_env_register_objformat(env, format, error)); osync_objformat_unref(format); /* mockformat2 */ @@ -262,7 +262,7 @@ _format_set_functions(format); osync_objformat_set_destroy_func(format, destroy_mockformat2); - osync_format_env_register_objformat(env, format); + osync_assert(osync_format_env_register_objformat(env, format, error)); osync_objformat_unref(format); /* mockformat3 */ @@ -271,7 +271,7 @@ _format_set_functions(format); - osync_format_env_register_objformat(env, format); + osync_assert(osync_format_env_register_objformat(env, format, error)); osync_objformat_unref(format); return TRUE; Modified: trunk/tests/mock-plugin/mock_sync.c ============================================================================== --- trunk/tests/mock-plugin/mock_sync.c Thu Sep 17 01:30:03 2009 (r5771) +++ trunk/tests/mock-plugin/mock_sync.c Thu Sep 17 02:15:23 2009 (r5772) @@ -768,7 +768,9 @@ osync_plugin_set_finalize(plugin, mock_finalize); osync_plugin_set_discover(plugin, mock_discover); - osync_plugin_env_register_plugin(env, plugin); + if (!osync_plugin_env_register_plugin(env, plugin, error)) + goto error; + osync_plugin_unref(plugin); plugin = osync_plugin_new(error); @@ -783,11 +785,16 @@ osync_plugin_set_finalize(plugin, mock_finalize); osync_plugin_set_discover(plugin, mock_discover); - osync_plugin_env_register_plugin(env, plugin); + if (!osync_plugin_env_register_plugin(env, plugin, error)) + goto error; + osync_plugin_unref(plugin); return TRUE; + +error: + return FALSE; } int get_version(void) Modified: trunk/wrapper/opensync-format.i ============================================================================== --- trunk/wrapper/opensync-format.i Thu Sep 17 01:30:03 2009 (r5771) +++ trunk/wrapper/opensync-format.i Thu Sep 17 02:15:23 2009 (r5772) @@ -166,7 +166,9 @@ } void register_objformat(ObjFormat *format) { - osync_format_env_register_objformat(self, format); + Error *err = NULL; + osync_format_env_register_objformat(self, format, &err); + raise_exception_on_error(err); } ObjFormat *find_objformat(const char *name) { @@ -191,7 +193,9 @@ /* void register_filter(CustomFilter *filter) { - osync_format_env_register_filter(self, filter); + Error *err = NULL; + osync_format_env_register_filter(self, filter, &err); + raise_exception_on_error(err); } int num_filters() { Modified: trunk/wrapper/opensync-plugin.i ============================================================================== --- trunk/wrapper/opensync-plugin.i Thu Sep 17 01:30:03 2009 (r5771) +++ trunk/wrapper/opensync-plugin.i Thu Sep 17 02:15:23 2009 (r5772) @@ -109,7 +109,9 @@ } void register_plugin(Plugin *plugin) { - osync_plugin_env_register_plugin(self, plugin); + Error *err = NULL; + osync_plugin_env_register_plugin(self, plugin, &err); + raise_exception_on_error(err); } Plugin *find_plugin(const char *name) { |
