[Opensync-commits] r5773 - format-plugins/xmlformat/trunk/src

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

Author: dgollub
Date: Thu Sep 17 02:16:52 2009
New Revision: 5773
URL: http://www.opensync.org/changeset/5773

Log:
Port xmlformat plugin to format_env register API changes. See #1087

Modified:
   format-plugins/xmlformat/trunk/src/xmlformat-doc.c
   format-plugins/xmlformat/trunk/src/xmlformat.c

Modified: format-plugins/xmlformat/trunk/src/xmlformat-doc.c
==============================================================================
--- format-plugins/xmlformat/trunk/src/xmlformat-doc.c	Thu Sep 17 02:15:23 2009	(r5772)
+++ format-plugins/xmlformat/trunk/src/xmlformat-doc.c	Thu Sep 17 02:16:52 2009	(r5773)
@@ -108,17 +108,21 @@
 	OSyncError *error = NULL;
 
 	OSyncObjFormat *format = osync_objformat_new(name, objtype, &error);
-	if (!format) {
-		osync_trace(TRACE_ERROR, "Unable to register format: %s", osync_error_print(&error));
-		osync_error_unref(&error);
-		return FALSE;
-	}
+
+	if (!format)
+		goto error;
 
 	osync_objformat_set_destroy_func(format, destroy);
-	osync_format_env_register_objformat(env, format);
+	if (!osync_format_env_register_objformat(env, format, &error))
+		goto error;
 	osync_objformat_unref(format);
 
 	return TRUE;
+
+error:
+	osync_trace(TRACE_ERROR, "Unable to register format: %s", osync_error_print(&error));
+	osync_error_unref(&error);
+	return FALSE;
 }
 
 void get_format_info(OSyncFormatEnv *env)

Modified: format-plugins/xmlformat/trunk/src/xmlformat.c
==============================================================================
--- format-plugins/xmlformat/trunk/src/xmlformat.c	Thu Sep 17 02:15:23 2009	(r5772)
+++ format-plugins/xmlformat/trunk/src/xmlformat.c	Thu Sep 17 02:16:52 2009	(r5773)
@@ -398,7 +398,9 @@
 	osync_merger_set_demerge_func(merger, demerge_xmlformat);
 
 
-        osync_format_env_register_merger(env, merger);
+        if (!osync_format_env_register_merger(env, merger, error))
+		goto error;
+
         osync_merger_unref(merger);
 
 	return TRUE;
@@ -434,7 +436,9 @@
 	osync_objformat_set_demarshal_func(format, demarshal_xmlformat);
 
 
-	osync_format_env_register_objformat(env, format);
+	if (!osync_format_env_register_objformat(env, format, &error))
+		goto error;
+
 	osync_objformat_unref(format);
 
 	if (!register_merger(env, "xmlformat-contact", &error))
@@ -461,7 +465,9 @@
 	osync_objformat_set_marshal_func(format, marshal_xmlformat);
 	osync_objformat_set_demarshal_func(format, demarshal_xmlformat);
 
-	osync_format_env_register_objformat(env, format);
+	if (!osync_format_env_register_objformat(env, format, &error))
+		goto error;
+
 	osync_objformat_unref(format);
 
 	if (!register_merger(env, "xmlformat-event", &error))
@@ -488,7 +494,9 @@
 	osync_objformat_set_marshal_func(format, marshal_xmlformat);
 	osync_objformat_set_demarshal_func(format, demarshal_xmlformat);
 
-	osync_format_env_register_objformat(env, format);
+	if (!osync_format_env_register_objformat(env, format, &error))
+		goto error;
+
 	osync_objformat_unref(format);
 
 	if (!register_merger(env, "xmlformat-todo", &error))
@@ -515,7 +523,9 @@
 	osync_objformat_set_marshal_func(format, marshal_xmlformat);
 	osync_objformat_set_demarshal_func(format, demarshal_xmlformat);
 
-	osync_format_env_register_objformat(env, format);
+	if (!osync_format_env_register_objformat(env, format, &error))
+		goto error;
+
 	osync_objformat_unref(format);
 
 	if (!register_merger(env, "xmlformat-note", &error))