[Opensync-commits] r5671 - in trunk: opensync/format tests/format-tests tests/mock-plugin

[<svn...@op...>]

Author: bricks
Date: Wed Jun 17 12:23:24 2009
New Revision: 5671
URL: http://www.opensync.org/changeset/5671

Log:
Added an OSyncError parameter for osync_format_env_register_converter
refs #1087

Modified:
   trunk/opensync/format/opensync_format_env.c
   trunk/opensync/format/opensync_format_env.h
   trunk/tests/format-tests/check_conv.c
   trunk/tests/format-tests/check_detect.c
   trunk/tests/format-tests/check_format_env.c
   trunk/tests/mock-plugin/mock_format.c

Modified: trunk/opensync/format/opensync_format_env.c
==============================================================================
--- trunk/opensync/format/opensync_format_env.c	Fri Jun  5 00:33:21 2009	(r5670)
+++ trunk/opensync/format/opensync_format_env.c	Wed Jun 17 12:23:24 2009	(r5671)
@@ -853,7 +853,7 @@
 	return osync_list_copy(env->objformats);
 }
 
-void osync_format_env_register_converter(OSyncFormatEnv *env, OSyncFormatConverter *converter)
+void osync_format_env_register_converter(OSyncFormatEnv *env, OSyncFormatConverter *converter, OSyncError **error)
 {
 	osync_assert(env);
 	osync_assert(converter);
@@ -862,7 +862,7 @@
 	 * of a detector can always be used */
 	if (osync_converter_get_type(converter) == OSYNC_CONVERTER_DETECTOR) {
 		
-		OSyncFormatConverter *conv = osync_converter_new_detector(osync_converter_get_targetformat(converter), osync_converter_get_sourceformat(converter), NULL, NULL);
+		OSyncFormatConverter *conv = osync_converter_new_detector(osync_converter_get_targetformat(converter), osync_converter_get_sourceformat(converter), NULL, error);
 		if (!conv)
 			return;
 	

Modified: trunk/opensync/format/opensync_format_env.h
==============================================================================
--- trunk/opensync/format/opensync_format_env.h	Fri Jun  5 00:33:21 2009	(r5670)
+++ trunk/opensync/format/opensync_format_env.h	Wed Jun 17 12:23:24 2009	(r5671)
@@ -115,8 +115,9 @@
  * 
  * @param env The format environment
  * @param converter Pointer of the Format Converter or Detector
+ * @param error An OSyncError
  */
-OSYNC_EXPORT void osync_format_env_register_converter(OSyncFormatEnv *env, OSyncFormatConverter *converter);
+OSYNC_EXPORT void osync_format_env_register_converter(OSyncFormatEnv *env, OSyncFormatConverter *converter, OSyncError **error);
 
 /** @brief Finds first converter with the given source and target format
  * 

Modified: trunk/tests/format-tests/check_conv.c
==============================================================================
--- trunk/tests/format-tests/check_conv.c	Fri Jun  5 00:33:21 2009	(r5670)
+++ trunk/tests/format-tests/check_conv.c	Wed Jun 17 12:23:24 2009	(r5671)
@@ -149,7 +149,7 @@
 	fail_unless(converter != NULL, NULL);
 	fail_unless(error == NULL, NULL);
 	
-	osync_format_env_register_converter(env, converter);
+	osync_format_env_register_converter(env, converter, &error);
 
 	osync_converter_unref(converter);
 	
@@ -187,7 +187,7 @@
 	
 	fail_unless(osync_format_env_num_converters(env) == 0, NULL);
 	
-	osync_format_env_register_converter(env, converter);
+	osync_format_env_register_converter(env, converter, &error);
 
 	fail_unless(osync_format_env_num_converters(env) == 1, NULL);
 	fail_unless(osync_format_env_nth_converter(env, 0) == converter, NULL);
@@ -226,7 +226,7 @@
 	fail_unless(converter != NULL, NULL);
 	fail_unless(error == NULL, NULL);
 	
-	osync_format_env_register_converter(env, converter);
+	osync_format_env_register_converter(env, converter, &error);
 	osync_converter_unref(converter);
 
 	fail_unless(osync_format_env_find_converter(env, format1, format2) == converter, NULL);
@@ -268,7 +268,7 @@
 	fail_unless(converter != NULL, NULL);
 	fail_unless(error == NULL, NULL);
 	
-	osync_format_env_register_converter(env, converter);
+	osync_format_env_register_converter(env, converter, &error);
 	osync_converter_unref(converter);
 
 	fail_unless(osync_format_env_find_converter(env, format1, format3) == NULL, NULL);
@@ -393,7 +393,7 @@
 	OSyncFormatConverter *converter = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format2, convert_func, &error);
 	fail_unless(converter != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter);
+	osync_format_env_register_converter(env, converter, &error);
 	osync_converter_unref(converter);
 
 	OSyncData *data1 = osync_data_new(g_strdup("data"), 5, format1, &error);
@@ -461,13 +461,13 @@
 	OSyncFormatConverter *converter1 = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format2, convert_func, &error);
 	fail_unless(converter1 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter1);
+	osync_format_env_register_converter(env, converter1, &error);
 	osync_converter_unref(converter1);
 	
 	OSyncFormatConverter *converter2 = osync_converter_new(OSYNC_CONVERTER_CONV, format2, format3, convert_func, &error);
 	fail_unless(converter2 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter2);
+	osync_format_env_register_converter(env, converter2, &error);
 	osync_converter_unref(converter2);
 
 	OSyncData *data1 = osync_data_new(g_strdup("data"), 5, format1, &error);
@@ -523,13 +523,13 @@
 	OSyncFormatConverter *converter1 = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format2, convert_func, &error);
 	fail_unless(converter1 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter1);
+	osync_format_env_register_converter(env, converter1, &error);
 	osync_converter_unref(converter1);
 	
 	OSyncFormatConverter *converter2 = osync_converter_new(OSYNC_CONVERTER_CONV, format3, format2, convert_func, &error);
 	fail_unless(converter2 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter2);
+	osync_format_env_register_converter(env, converter2, &error);
 	osync_converter_unref(converter2);
 
 	OSyncData *data1 = osync_data_new("data", 5, format1, &error);
@@ -589,25 +589,25 @@
 	OSyncFormatConverter *converter1 = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format2, convert_func, &error);
 	fail_unless(converter1 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter1);
+	osync_format_env_register_converter(env, converter1, &error);
 	osync_converter_unref(converter1);
 	
 	OSyncFormatConverter *converter2 = osync_converter_new(OSYNC_CONVERTER_CONV, format2, format4, convert_func, &error);
 	fail_unless(converter2 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter2);
+	osync_format_env_register_converter(env, converter2, &error);
 	osync_converter_unref(converter2);
 	
 	OSyncFormatConverter *converter3 = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format3, convert_func, &error);
 	fail_unless(converter3 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter3);
+	osync_format_env_register_converter(env, converter3, &error);
 	osync_converter_unref(converter3);
 	
 	OSyncFormatConverter *converter4 = osync_converter_new(OSYNC_CONVERTER_CONV, format3, format4, convert_func, &error);
 	fail_unless(converter4 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter4);
+	osync_format_env_register_converter(env, converter4, &error);
 	osync_converter_unref(converter4);
 
 	OSyncData *data1 = osync_data_new(g_strdup("data"), 5, format1, &error);
@@ -672,25 +672,25 @@
 	OSyncFormatConverter *converter1 = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format2, convert_func, &error);
 	fail_unless(converter1 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter1);
+	osync_format_env_register_converter(env, converter1, &error);
 	osync_converter_unref(converter1);
 	
 	OSyncFormatConverter *converter2 = osync_converter_new(OSYNC_CONVERTER_CONV, format2, format4, convert_func, &error);
 	fail_unless(converter2 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter2);
+	osync_format_env_register_converter(env, converter2, &error);
 	osync_converter_unref(converter2);
 	
 	OSyncFormatConverter *converter3 = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format3, convert_func, &error);
 	fail_unless(converter3 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter3);
+	osync_format_env_register_converter(env, converter3, &error);
 	osync_converter_unref(converter3);
 	
 	OSyncFormatConverter *converter4 = osync_converter_new(OSYNC_CONVERTER_CONV, format3, format4, convert_func, &error);
 	fail_unless(converter4 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter4);
+	osync_format_env_register_converter(env, converter4, &error);
 	osync_converter_unref(converter4);
 
 	OSyncData *data1 = osync_data_new(g_strdup("data"), 5, format1, &error);
@@ -751,19 +751,19 @@
 	OSyncFormatConverter *converter1 = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format2, convert_func, &error);
 	fail_unless(converter1 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter1);
+	osync_format_env_register_converter(env, converter1, &error);
 	osync_converter_unref(converter1);
 	
 	OSyncFormatConverter *converter2 = osync_converter_new(OSYNC_CONVERTER_CONV, format2, format3, convert_func, &error);
 	fail_unless(converter2 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter2);
+	osync_format_env_register_converter(env, converter2, &error);
 	osync_converter_unref(converter2);
 	
 	OSyncFormatConverter *converter3 = osync_converter_new(OSYNC_CONVERTER_CONV, format3, format1, convert_func, &error);
 	fail_unless(converter3 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter3);
+	osync_format_env_register_converter(env, converter3, &error);
 	osync_converter_unref(converter3);
 
 	OSyncData *data1 = osync_data_new("data", 5, format1, &error);
@@ -848,55 +848,55 @@
 	OSyncFormatConverter *converter1 = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format2, convert_func, &error);
 	fail_unless(converter1 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter1);
+	osync_format_env_register_converter(env, converter1, &error);
 	osync_converter_unref(converter1);
 	
 	OSyncFormatConverter *converter2 = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format3, convert_func, &error);
 	fail_unless(converter2 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter2);
+	osync_format_env_register_converter(env, converter2, &error);
 	osync_converter_unref(converter2);
 	
 	OSyncFormatConverter *converter3 = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format4, convert_func, &error);
 	fail_unless(converter3 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter3);
+	osync_format_env_register_converter(env, converter3, &error);
 	osync_converter_unref(converter3);
 	
 	OSyncFormatConverter *converter4 = osync_converter_new(OSYNC_CONVERTER_CONV, format3, format5, convert_func, &error);
 	fail_unless(converter4 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter4);
+	osync_format_env_register_converter(env, converter4, &error);
 	osync_converter_unref(converter4);
 	
 	OSyncFormatConverter *converter5 = osync_converter_new(OSYNC_CONVERTER_CONV, format4, format7, convert_func, &error);
 	fail_unless(converter5 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter5);
+	osync_format_env_register_converter(env, converter5, &error);
 	osync_converter_unref(converter5);
 	
 	OSyncFormatConverter *converter6 = osync_converter_new(OSYNC_CONVERTER_CONV, format5, format7, convert_func, &error);
 	fail_unless(converter6 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter6);
+	osync_format_env_register_converter(env, converter6, &error);
 	osync_converter_unref(converter6);
 	
 	OSyncFormatConverter *converter7 = osync_converter_new(OSYNC_CONVERTER_CONV, format7, format8, convert_func, &error);
 	fail_unless(converter7 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter7);
+	osync_format_env_register_converter(env, converter7, &error);
 	osync_converter_unref(converter7);
 	
 	OSyncFormatConverter *converter8 = osync_converter_new(OSYNC_CONVERTER_CONV, format8, format6, convert_func, &error);
 	fail_unless(converter8 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter8);
+	osync_format_env_register_converter(env, converter8, &error);
 	osync_converter_unref(converter8);
 	
 	OSyncFormatConverter *converter9 = osync_converter_new(OSYNC_CONVERTER_CONV, format5, format6, convert_func, &error);
 	fail_unless(converter9 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter9);
+	osync_format_env_register_converter(env, converter9, &error);
 	osync_converter_unref(converter9);
 
 	OSyncData *data1 = osync_data_new(g_strdup("data"), 5, format1, &error);
@@ -957,13 +957,13 @@
 	OSyncFormatConverter *converter1 = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format2, convert_func, &error);
 	fail_unless(converter1 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter1);
+	osync_format_env_register_converter(env, converter1, &error);
 	osync_converter_unref(converter1);
 	
 	OSyncFormatConverter *converter2 = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format3, convert_func, &error);
 	fail_unless(converter2 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter2);
+	osync_format_env_register_converter(env, converter2, &error);
 	osync_converter_unref(converter2);
 
 	OSyncList *targets = NULL; 
@@ -1026,19 +1026,19 @@
 	OSyncFormatConverter *converter1 = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format2, convert_func, &error);
 	fail_unless(converter1 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter1);
+	osync_format_env_register_converter(env, converter1, &error);
 	osync_converter_unref(converter1);
 	
 	OSyncFormatConverter *converter2 = osync_converter_new(OSYNC_CONVERTER_CONV, format2, format4, convert_func, &error);
 	fail_unless(converter2 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter2);
+	osync_format_env_register_converter(env, converter2, &error);
 	osync_converter_unref(converter2);
 	
 	OSyncFormatConverter *converter3 = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format3, convert_func, &error);
 	fail_unless(converter3 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter3);
+	osync_format_env_register_converter(env, converter3, &error);
 	osync_converter_unref(converter3);
 
 	OSyncList *targets = NULL; 
@@ -1112,31 +1112,31 @@
 	OSyncFormatConverter *converter1 = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format2, convert_func, &error);
 	fail_unless(converter1 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter1);
+	osync_format_env_register_converter(env, converter1, &error);
 	osync_converter_unref(converter1);
 	
 	OSyncFormatConverter *converter2 = osync_converter_new(OSYNC_CONVERTER_CONV, format2, format4, convert_func, &error);
 	fail_unless(converter2 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter2);
+	osync_format_env_register_converter(env, converter2, &error);
 	osync_converter_unref(converter2);
 	
 	OSyncFormatConverter *converter3 = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format3, convert_func, &error);
 	fail_unless(converter3 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter3);
+	osync_format_env_register_converter(env, converter3, &error);
 	osync_converter_unref(converter3);
 	
 	OSyncFormatConverter *converter4 = osync_converter_new(OSYNC_CONVERTER_CONV, format3, format4, convert_func, &error);
 	fail_unless(converter4 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter4);
+	osync_format_env_register_converter(env, converter4, &error);
 	osync_converter_unref(converter4);
 
 	OSyncFormatConverter *converter5 = osync_converter_new(OSYNC_CONVERTER_CONV, format3, format5, convert_func, &error);
 	fail_unless(converter5 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter5);
+	osync_format_env_register_converter(env, converter5, &error);
 	osync_converter_unref(converter5);
 
 	OSyncList *targets = NULL; 
@@ -1212,31 +1212,31 @@
 	OSyncFormatConverter *converter1 = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format2, convert_func, &error);
 	fail_unless(converter1 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter1);
+	osync_format_env_register_converter(env, converter1, &error);
 	osync_converter_unref(converter1);
 	
 	OSyncFormatConverter *converter2 = osync_converter_new(OSYNC_CONVERTER_CONV, format2, format4, convert_func, &error);
 	fail_unless(converter2 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter2);
+	osync_format_env_register_converter(env, converter2, &error);
 	osync_converter_unref(converter2);
 	
 	OSyncFormatConverter *converter3 = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format3, convert_func, &error);
 	fail_unless(converter3 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter3);
+	osync_format_env_register_converter(env, converter3, &error);
 	osync_converter_unref(converter3);
 	
 	OSyncFormatConverter *converter4 = osync_converter_new(OSYNC_CONVERTER_CONV, format3, format4, convert_func, &error);
 	fail_unless(converter4 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter4);
+	osync_format_env_register_converter(env, converter4, &error);
 	osync_converter_unref(converter4);
 
 	OSyncFormatConverter *converter5 = osync_converter_new(OSYNC_CONVERTER_CONV, format3, format5, convert_func, &error);
 	fail_unless(converter5 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter5);
+	osync_format_env_register_converter(env, converter5, &error);
 	osync_converter_unref(converter5);
 
 	OSyncList *targets = NULL; 
@@ -1346,13 +1346,13 @@
 	OSyncFormatConverter *converter1 = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format2, convert_addtest, &error);
 	fail_unless(converter1 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter1);
+	osync_format_env_register_converter(env, converter1, &error);
 	osync_converter_unref(converter1);
 	
 	OSyncFormatConverter *converter2 = osync_converter_new(OSYNC_CONVERTER_CONV, format2, format3, convert_addtest2, &error);
 	fail_unless(converter2 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter2);
+	osync_format_env_register_converter(env, converter2, &error);
 	osync_converter_unref(converter2);
 
 	mark_point();
@@ -1407,25 +1407,25 @@
 	OSyncFormatConverter *converter1 = osync_converter_new(OSYNC_CONVERTER_CONV, format1, format2, convert_addtest, &error);
 	fail_unless(converter1 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter1);
+	osync_format_env_register_converter(env, converter1, &error);
 	osync_converter_unref(converter1);
 
 	OSyncFormatConverter *converter1_back = osync_converter_new(OSYNC_CONVERTER_CONV, format2, format1, convert_remtest, &error);
 	fail_unless(converter1_back != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter1_back);
+	osync_format_env_register_converter(env, converter1_back, &error);
 	osync_converter_unref(converter1_back);
 	
 	OSyncFormatConverter *converter2 = osync_converter_new(OSYNC_CONVERTER_CONV, format2, format3, convert_addtest2, &error);
 	fail_unless(converter2 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter2);
+	osync_format_env_register_converter(env, converter2, &error);
 	osync_converter_unref(converter2);
 
 	OSyncFormatConverter *converter2_back = osync_converter_new(OSYNC_CONVERTER_CONV, format3, format2, convert_remtest2, &error);
 	fail_unless(converter2_back != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter2_back);
+	osync_format_env_register_converter(env, converter2_back, &error);
 	osync_converter_unref(converter2_back);
 
 	mark_point();
@@ -1497,25 +1497,25 @@
 	OSyncFormatConverter *converter1 = osync_converter_new(OSYNC_CONVERTER_DECAP, format1, format2, convert_addtest, &error);
 	fail_unless(converter1 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter1);
+	osync_format_env_register_converter(env, converter1, &error);
 	osync_converter_unref(converter1);
 
 	OSyncFormatConverter *converter1_back = osync_converter_new(OSYNC_CONVERTER_ENCAP, format2, format1, convert_remtest, &error);
 	fail_unless(converter1_back != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter1_back);
+	osync_format_env_register_converter(env, converter1_back, &error);
 	osync_converter_unref(converter1_back);
 	
 	OSyncFormatConverter *converter2 = osync_converter_new(OSYNC_CONVERTER_DECAP, format2, format3, convert_addtest2, &error);
 	fail_unless(converter2 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter2);
+	osync_format_env_register_converter(env, converter2, &error);
 	osync_converter_unref(converter2);
 
 	OSyncFormatConverter *converter2_back = osync_converter_new(OSYNC_CONVERTER_ENCAP, format3, format2, convert_remtest2, &error);
 	fail_unless(converter2_back != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, converter2_back);
+	osync_format_env_register_converter(env, converter2_back, &error);
 	osync_converter_unref(converter2_back);
 
 	mark_point();
@@ -1608,59 +1608,59 @@
 	OSyncFormatConverter *detector1 = osync_converter_new_detector(format2, format4, detect_true, &error);
 	fail_unless(detector1 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, detector1);
+	osync_format_env_register_converter(env, detector1, &error);
 //	osync_converter_unref(detector1);
 
 	OSyncFormatConverter *detector2 = osync_converter_new_detector(format2, format3, detect_false, &error);
 	fail_unless(detector2 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, detector2);
+	osync_format_env_register_converter(env, detector2, &error);
 //	osync_converter_unref(detector2);
 
 	/*** Converter ***/
 
 	OSyncFormatConverter *converter1 = osync_converter_new(OSYNC_CONVERTER_DECAP, format1, format2, convert_addtest, &error);
-	osync_format_env_register_converter(env, converter1);
+	osync_format_env_register_converter(env, converter1, &error);
 	osync_converter_unref(converter1);
 
 	OSyncFormatConverter *converter1_back = osync_converter_new(OSYNC_CONVERTER_ENCAP, format2, format1, convert_remtest, &error);
-	osync_format_env_register_converter(env, converter1_back);
+	osync_format_env_register_converter(env, converter1_back, &error);
 	osync_converter_unref(converter1_back);
 	
 	OSyncFormatConverter *converter2 = osync_converter_new(OSYNC_CONVERTER_DECAP, format2, format3, convert_addtest2, &error);
-	osync_format_env_register_converter(env, converter2);
+	osync_format_env_register_converter(env, converter2, &error);
 	osync_converter_unref(converter2);
 
 	OSyncFormatConverter *converter2_back = osync_converter_new(OSYNC_CONVERTER_ENCAP, format3, format2, convert_remtest2, &error);
-	osync_format_env_register_converter(env, converter2_back);
+	osync_format_env_register_converter(env, converter2_back, &error);
 	osync_converter_unref(converter2_back);
 
 	OSyncFormatConverter *converter3 = osync_converter_new(OSYNC_CONVERTER_DECAP, format2, format4, convert_addtest2, &error);
-	osync_format_env_register_converter(env, converter3);
+	osync_format_env_register_converter(env, converter3, &error);
 	osync_converter_unref(converter3);
 
 	OSyncFormatConverter *converter3_back = osync_converter_new(OSYNC_CONVERTER_ENCAP, format4, format2, convert_remtest2, &error);
-	osync_format_env_register_converter(env, converter3_back);
+	osync_format_env_register_converter(env, converter3_back, &error);
 	osync_converter_unref(converter3_back);
 
 	OSyncFormatConverter *converter4 = osync_converter_new(OSYNC_CONVERTER_CONV, format3, format6, convert_addtest2, &error);
-	osync_format_env_register_converter(env, converter4);
+	osync_format_env_register_converter(env, converter4, &error);
 	osync_converter_unref(converter4);
 
 	OSyncFormatConverter *converter5 = osync_converter_new(OSYNC_CONVERTER_CONV, format4, format5, convert_addtest2, &error);
-	osync_format_env_register_converter(env, converter5);
+	osync_format_env_register_converter(env, converter5, &error);
 	osync_converter_unref(converter5);
 
 	OSyncFormatConverter *converter6 = osync_converter_new(OSYNC_CONVERTER_CONV, format5, format4, convert_remtest2, &error);
-	osync_format_env_register_converter(env, converter6);
+	osync_format_env_register_converter(env, converter6, &error);
 	osync_converter_unref(converter6);
 
 	OSyncFormatConverter *converter7 = osync_converter_new(OSYNC_CONVERTER_ENCAP, format5, format6, convert_addtest2, &error);
-	osync_format_env_register_converter(env, converter7);
+	osync_format_env_register_converter(env, converter7, &error);
 	osync_converter_unref(converter7);
 
 	OSyncFormatConverter *converter7_back = osync_converter_new(OSYNC_CONVERTER_DECAP, format6, format5, convert_remtest2, &error);
-	osync_format_env_register_converter(env, converter7_back);
+	osync_format_env_register_converter(env, converter7_back, &error);
 	osync_converter_unref(converter7_back);
 
 	mark_point();
@@ -1737,7 +1737,7 @@
 	OSyncFormatConverter *detector1 = osync_converter_new_detector(format1, format2, detect_true, &error);
 	fail_unless(detector1 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, detector1);
+	osync_format_env_register_converter(env, detector1, &error);
 //	osync_converter_unref(detector1);
 
 	/* Detect F3, not F4 */
@@ -1745,47 +1745,47 @@
 	OSyncFormatConverter *detector2 = osync_converter_new_detector(format2, format3, detect_true, &error);
 	fail_unless(detector2 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, detector2);
+	osync_format_env_register_converter(env, detector2, &error);
 //	osync_converter_unref(detector2);
 
 	OSyncFormatConverter *detector3 = osync_converter_new_detector(format2, format4, detect_false, &error);
 	fail_unless(detector3 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, detector3);
+	osync_format_env_register_converter(env, detector3, &error);
 //	osync_converter_unref(detector3);
 
 	/*** Converter ***/
 
 	OSyncFormatConverter *converter1 = osync_converter_new(OSYNC_CONVERTER_DECAP, format1, format2, convert_addtest, &error);
-	osync_format_env_register_converter(env, converter1);
+	osync_format_env_register_converter(env, converter1, &error);
 	osync_converter_unref(converter1);
 
 	OSyncFormatConverter *converter1_back = osync_converter_new(OSYNC_CONVERTER_ENCAP, format2, format1, convert_remtest, &error);
-	osync_format_env_register_converter(env, converter1_back);
+	osync_format_env_register_converter(env, converter1_back, &error);
 	osync_converter_unref(converter1_back);
 	
 	OSyncFormatConverter *converter2 = osync_converter_new(OSYNC_CONVERTER_DECAP, format2, format3, convert_addtest2, &error);
-	osync_format_env_register_converter(env, converter2);
+	osync_format_env_register_converter(env, converter2, &error);
 	osync_converter_unref(converter2);
 
 	OSyncFormatConverter *converter2_back = osync_converter_new(OSYNC_CONVERTER_ENCAP, format3, format2, convert_remtest2, &error);
-	osync_format_env_register_converter(env, converter2_back);
+	osync_format_env_register_converter(env, converter2_back, &error);
 	osync_converter_unref(converter2_back);
 
 	OSyncFormatConverter *converter3 = osync_converter_new(OSYNC_CONVERTER_DECAP, format2, format4, convert_addtest2, &error);
-	osync_format_env_register_converter(env, converter3);
+	osync_format_env_register_converter(env, converter3, &error);
 	osync_converter_unref(converter3);
 
 	OSyncFormatConverter *converter3_back = osync_converter_new(OSYNC_CONVERTER_ENCAP, format4, format2, convert_remtest2, &error);
-	osync_format_env_register_converter(env, converter3_back);
+	osync_format_env_register_converter(env, converter3_back, &error);
 	osync_converter_unref(converter3_back);
 
 	OSyncFormatConverter *converter4 = osync_converter_new(OSYNC_CONVERTER_CONV, format3, format4, convert_addtest2, &error);
-	osync_format_env_register_converter(env, converter4);
+	osync_format_env_register_converter(env, converter4, &error);
 	osync_converter_unref(converter4);
 
 	OSyncFormatConverter *converter5 = osync_converter_new(OSYNC_CONVERTER_CONV, format4, format3, convert_remtest2, &error);
-	osync_format_env_register_converter(env, converter5);
+	osync_format_env_register_converter(env, converter5, &error);
 	osync_converter_unref(converter5);
 
 
@@ -1872,7 +1872,7 @@
 	OSyncFormatConverter *detector1 = osync_converter_new_detector(format1, format2, detect_true, &error);
 	fail_unless(detector1 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, detector1);
+	osync_format_env_register_converter(env, detector1, &error);
 //	osync_converter_unref(detector1);
 
 	/* Detect F3, not F4 */
@@ -1880,35 +1880,35 @@
 	OSyncFormatConverter *detector2 = osync_converter_new_detector(format2, format3, detect_true, &error);
 	fail_unless(detector2 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, detector2);
+	osync_format_env_register_converter(env, detector2, &error);
 //	osync_converter_unref(detector2);
 
 	OSyncFormatConverter *detector3 = osync_converter_new_detector(format2, format4, detect_false, &error);
 	fail_unless(detector3 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, detector3);
+	osync_format_env_register_converter(env, detector3, &error);
 //	osync_converter_unref(detector3);
 
 	/*** Converter ***/
 
 	OSyncFormatConverter *converter1 = osync_converter_new(OSYNC_CONVERTER_ENCAP, format1, format2, convert_addtest, &error);
-	osync_format_env_register_converter(env, converter1);
+	osync_format_env_register_converter(env, converter1, &error);
 	osync_converter_unref(converter1);
 
 	OSyncFormatConverter *converter1_back = osync_converter_new(OSYNC_CONVERTER_ENCAP, format2, format3, convert_addtest, &error);
-	osync_format_env_register_converter(env, converter1_back);
+	osync_format_env_register_converter(env, converter1_back, &error);
 	osync_converter_unref(converter1_back);
 	
 	OSyncFormatConverter *converter2 = osync_converter_new(OSYNC_CONVERTER_ENCAP, format3, format5, convert_addtest, &error);
-	osync_format_env_register_converter(env, converter2);
+	osync_format_env_register_converter(env, converter2, &error);
 	osync_converter_unref(converter2);
 
 	OSyncFormatConverter *converter2_back = osync_converter_new(OSYNC_CONVERTER_DECAP, format1, format4, convert_addtest2, &error);
-	osync_format_env_register_converter(env, converter2_back);
+	osync_format_env_register_converter(env, converter2_back, &error);
 	osync_converter_unref(converter2_back);
 
 	OSyncFormatConverter *converter3 = osync_converter_new(OSYNC_CONVERTER_ENCAP, format4, format5, convert_addtest2, &error);
-	osync_format_env_register_converter(env, converter3);
+	osync_format_env_register_converter(env, converter3, &error);
 	osync_converter_unref(converter3);
 
 	mark_point();
@@ -1991,27 +1991,27 @@
 	/*** Converter ***/
 
 	OSyncFormatConverter *converter1 = osync_converter_new(OSYNC_CONVERTER_ENCAP, format1, format2, convert_addtest, &error);
-	osync_format_env_register_converter(env, converter1);
+	osync_format_env_register_converter(env, converter1, &error);
 	osync_converter_unref(converter1);
 
 	OSyncFormatConverter *converter1_back = osync_converter_new(OSYNC_CONVERTER_ENCAP, format2, format3, convert_addtest, &error);
-	osync_format_env_register_converter(env, converter1_back);
+	osync_format_env_register_converter(env, converter1_back, &error);
 	osync_converter_unref(converter1_back);
 	
 	OSyncFormatConverter *converter2 = osync_converter_new(OSYNC_CONVERTER_ENCAP, format3, format4, convert_addtest, &error);
-	osync_format_env_register_converter(env, converter2);
+	osync_format_env_register_converter(env, converter2, &error);
 	osync_converter_unref(converter2);
 
 	OSyncFormatConverter *converter3 = osync_converter_new(OSYNC_CONVERTER_ENCAP, format4, format5, convert_addtest, &error);
-	osync_format_env_register_converter(env, converter3);
+	osync_format_env_register_converter(env, converter3, &error);
 	osync_converter_unref(converter3);
 
 	OSyncFormatConverter *converter4 = osync_converter_new(OSYNC_CONVERTER_ENCAP, format5, format6, convert_addtest, &error);
-	osync_format_env_register_converter(env, converter4);
+	osync_format_env_register_converter(env, converter4, &error);
 	osync_converter_unref(converter4);
 
 	OSyncFormatConverter *converter5 = osync_converter_new(OSYNC_CONVERTER_ENCAP, format1, format_g1, convert_addtest2, &error);
-	osync_format_env_register_converter(env, converter5);
+	osync_format_env_register_converter(env, converter5, &error);
 	osync_converter_unref(converter5);
 
 	mark_point();
@@ -2100,27 +2100,27 @@
 	/*** Converter ***/
 
 	OSyncFormatConverter *converter1 = osync_converter_new(OSYNC_CONVERTER_ENCAP, format1, format2, convert_addtest, &error);
-	osync_format_env_register_converter(env, converter1);
+	osync_format_env_register_converter(env, converter1, &error);
 	osync_converter_unref(converter1);
 
 	OSyncFormatConverter *converter1_back = osync_converter_new(OSYNC_CONVERTER_DECAP, format2, format3, convert_addtest, &error); /* Lossy */
-	osync_format_env_register_converter(env, converter1_back);
+	osync_format_env_register_converter(env, converter1_back, &error);
 	osync_converter_unref(converter1_back);
 	
 	OSyncFormatConverter *converter2 = osync_converter_new(OSYNC_CONVERTER_ENCAP, format3, format4, convert_addtest, &error);
-	osync_format_env_register_converter(env, converter2);
+	osync_format_env_register_converter(env, converter2, &error);
 	osync_converter_unref(converter2);
 
 	OSyncFormatConverter *converter3 = osync_converter_new(OSYNC_CONVERTER_ENCAP, format4, format5, convert_addtest, &error);
-	osync_format_env_register_converter(env, converter3);
+	osync_format_env_register_converter(env, converter3, &error);
 	osync_converter_unref(converter3);
 
 	OSyncFormatConverter *converter4 = osync_converter_new(OSYNC_CONVERTER_ENCAP, format5, format6, convert_addtest, &error);
-	osync_format_env_register_converter(env, converter4);
+	osync_format_env_register_converter(env, converter4, &error);
 	osync_converter_unref(converter4);
 
 	OSyncFormatConverter *converter5 = osync_converter_new(OSYNC_CONVERTER_ENCAP, format1, format_g1, convert_addtest2, &error);
-	osync_format_env_register_converter(env, converter5);
+	osync_format_env_register_converter(env, converter5, &error);
 	osync_converter_unref(converter5);
 
 	mark_point();
@@ -2180,31 +2180,31 @@
 	OSyncFormatConverter *detector1 = osync_converter_new_detector(format1, format2, detect_true, &error);
 	fail_unless(detector1 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, detector1);
+	osync_format_env_register_converter(env, detector1, &error);
 //	osync_converter_unref(detector1);
 
 	OSyncFormatConverter *detector2 = osync_converter_new_detector(format2, format3, detect_false, &error);
 	fail_unless(detector2 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, detector2);
+	osync_format_env_register_converter(env, detector2, &error);
 //	osync_converter_unref(detector2);
 
 	/*** Converter ***/
 
 	OSyncFormatConverter *converter1 = osync_converter_new(OSYNC_CONVERTER_DECAP, format1, format2, convert_addtest, &error);
-	osync_format_env_register_converter(env, converter1);
+	osync_format_env_register_converter(env, converter1, &error);
 	osync_converter_unref(converter1);
 
 	OSyncFormatConverter *converter1_back = osync_converter_new(OSYNC_CONVERTER_ENCAP, format2, format1, convert_remtest, &error);
-	osync_format_env_register_converter(env, converter1_back);
+	osync_format_env_register_converter(env, converter1_back, &error);
 	osync_converter_unref(converter1_back);
 	
 	OSyncFormatConverter *converter2 = osync_converter_new(OSYNC_CONVERTER_DECAP, format2, format3, convert_addtest2, &error);
-	osync_format_env_register_converter(env, converter2);
+	osync_format_env_register_converter(env, converter2, &error);
 	osync_converter_unref(converter2);
 
 	OSyncFormatConverter *converter2_back = osync_converter_new(OSYNC_CONVERTER_ENCAP, format3, format2, convert_remtest2, &error);
-	osync_format_env_register_converter(env, converter2_back);
+	osync_format_env_register_converter(env, converter2_back, &error);
 	osync_converter_unref(converter2_back);
 
 	mark_point();
@@ -2258,25 +2258,25 @@
 	OSyncFormatConverter *detector1 = osync_converter_new_detector(format_plain, format2, detect_plain_as_f2, &error);
 	fail_unless(detector1 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, detector1);
+	osync_format_env_register_converter(env, detector1, &error);
 //	osync_converter_unref(detector1);
 
 	/*** Converter ***/
 
 	OSyncFormatConverter *converter1 = osync_converter_new(OSYNC_CONVERTER_DECAP, format1, format_plain, convert_addtest, &error);
-	osync_format_env_register_converter(env, converter1);
+	osync_format_env_register_converter(env, converter1, &error);
 	osync_converter_unref(converter1);
 
 	OSyncFormatConverter *converter1_back = osync_converter_new(OSYNC_CONVERTER_ENCAP, format_plain, format1, convert_remtest, &error);
-	osync_format_env_register_converter(env, converter1_back);
+	osync_format_env_register_converter(env, converter1_back, &error);
 	osync_converter_unref(converter1_back);
 	
 	OSyncFormatConverter *converter2 = osync_converter_new(OSYNC_CONVERTER_CONV, format2, format3, convert_addtest, &error);
-	osync_format_env_register_converter(env, converter2);
+	osync_format_env_register_converter(env, converter2, &error);
 	osync_converter_unref(converter2);
 
 	OSyncFormatConverter *converter2_back = osync_converter_new(OSYNC_CONVERTER_CONV, format3, format2, convert_remtest, &error);
-	osync_format_env_register_converter(env, converter2_back);
+	osync_format_env_register_converter(env, converter2_back, &error);
 	osync_converter_unref(converter2_back);
 
 	mark_point();
@@ -2383,25 +2383,25 @@
  	OSyncFormatConverter *detector1 = osync_converter_new_detector(format_plain, format2, detect_f2, &error);
 	fail_unless(detector1 != NULL, NULL);
 	fail_unless(error == NULL, NULL);
-	osync_format_env_register_converter(env, detector1);
+	osync_format_env_register_converter(env, detector1, &error);
 //	osync_converter_unref(detector1);
 
 	/*** Converter ***/
 
 	OSyncFormatConverter *converter1 = osync_converter_new(OSYNC_CONVERTER_DECAP, format1, format_plain, convert_f1_to_f2, &error);
-	osync_format_env_register_converter(env, converter1);
+	osync_format_env_register_converter(env, converter1, &error);
 	osync_converter_unref(converter1);
 
 	OSyncFormatConverter *converter1_back = osync_converter_new(OSYNC_CONVERTER_ENCAP, format_plain, format1, convert_f2_to_f1, &error);
-	osync_format_env_register_converter(env, converter1_back);
+	osync_format_env_register_converter(env, converter1_back, &error);
 	osync_converter_unref(converter1_back);
 	
 	OSyncFormatConverter *converter2 = osync_converter_new(OSYNC_CONVERTER_CONV, format2, format3, convert_addtest, &error);
-	osync_format_env_register_converter(env, converter2);
+	osync_format_env_register_converter(env, converter2, &error);
 	osync_converter_unref(converter2);
 
 	OSyncFormatConverter *converter2_back = osync_converter_new(OSYNC_CONVERTER_CONV, format3, format2, convert_remtest, &error);
-	osync_format_env_register_converter(env, converter2_back);
+	osync_format_env_register_converter(env, converter2_back, &error);
 	osync_converter_unref(converter2_back);
 
 	mark_point();

Modified: trunk/tests/format-tests/check_detect.c
==============================================================================
--- trunk/tests/format-tests/check_detect.c	Fri Jun  5 00:33:21 2009	(r5670)
+++ trunk/tests/format-tests/check_detect.c	Wed Jun 17 12:23:24 2009	(r5671)
@@ -24,7 +24,7 @@
 	OSyncFormatConverter *conv = osync_converter_new_detector(format2, format1, detect, &error);
 	fail_unless(error == NULL);
 
-	osync_format_env_register_converter(env, conv);
+	osync_format_env_register_converter(env, conv, &error);
 
 	mark_point();
 
@@ -55,7 +55,7 @@
 	OSyncFormatConverter *conv = osync_converter_new_detector(format2, format1, detect, &error);
 	fail_unless(error == NULL);
 
-	osync_format_env_register_converter(env, conv);
+	osync_format_env_register_converter(env, conv, &error);
 
 	mark_point();
 
@@ -86,7 +86,7 @@
 	OSyncFormatConverter *conv = osync_converter_new_detector(format2, format1, detect_false, &error);
 	fail_unless(error == NULL);
 
-	osync_format_env_register_converter(env, conv);
+	osync_format_env_register_converter(env, conv, &error);
 
 	mark_point();
 

Modified: trunk/tests/format-tests/check_format_env.c
==============================================================================
--- trunk/tests/format-tests/check_format_env.c	Fri Jun  5 00:33:21 2009	(r5670)
+++ trunk/tests/format-tests/check_format_env.c	Wed Jun 17 12:23:24 2009	(r5671)
@@ -147,7 +147,7 @@
 	fail_unless(converter != NULL, NULL);
 	fail_unless(error == NULL, NULL);
 	
-	osync_format_env_register_converter(env, converter);
+	osync_format_env_register_converter(env, converter, &error);
 
 	osync_converter_unref(converter);
 	
@@ -185,7 +185,7 @@
 	
 	fail_unless(osync_format_env_num_converters(env) == 0, NULL);
 	
-	osync_format_env_register_converter(env, converter);
+	osync_format_env_register_converter(env, converter, &error);
 
 	fail_unless(osync_format_env_num_converters(env) == 1, NULL);
 	fail_unless(osync_format_env_nth_converter(env, 0) == converter, NULL);
@@ -224,7 +224,7 @@
 	fail_unless(converter != NULL, NULL);
 	fail_unless(error == NULL, NULL);
 	
-	osync_format_env_register_converter(env, converter);
+	osync_format_env_register_converter(env, converter, &error);
 	osync_converter_unref(converter);
 
 	fail_unless(osync_format_env_find_converter(env, format1, format2) == converter, NULL);
@@ -266,7 +266,7 @@
 	fail_unless(converter != NULL, NULL);
 	fail_unless(error == NULL, NULL);
 	
-	osync_format_env_register_converter(env, converter);
+	osync_format_env_register_converter(env, converter, &error);
 	osync_converter_unref(converter);
 
 	fail_unless(osync_format_env_find_converter(env, format1, format3) == NULL, NULL);

Modified: trunk/tests/mock-plugin/mock_format.c
==============================================================================
--- trunk/tests/mock-plugin/mock_format.c	Fri Jun  5 00:33:21 2009	(r5670)
+++ trunk/tests/mock-plugin/mock_format.c	Wed Jun 17 12:23:24 2009	(r5671)
@@ -291,13 +291,13 @@
 	conv = osync_converter_new(OSYNC_CONVERTER_ENCAP, mockformat1, mockformat2, conv_mockformat1_to_mockformat2, error);
 	osync_assert(conv);
 	
-	osync_format_env_register_converter(env, conv);
+	osync_format_env_register_converter(env, conv, error);
 	osync_converter_unref(conv);
 	
 	conv = osync_converter_new(OSYNC_CONVERTER_DECAP, mockformat2, mockformat1, conv_mockformat2_to_mockformat1, error);
 	osync_assert(conv);
 	
-	osync_format_env_register_converter(env, conv);
+	osync_format_env_register_converter(env, conv, error);
 	osync_converter_unref(conv);