[Opensync-commits] r5007 - trunk/formats

[<dg...@su...>]

Author: dgollub
Date: Mon Jan  5 02:29:40 2009
New Revision: 5007
URL: http://www.opensync.org/changeset/5007

Log:
Drop xmlformat-doc decapsulator function cause wrong format detection.
The decapsuation, which is just memory duplication, always succeeds
which has bad influence object format detection. Fixes #1017

Modified:
   trunk/formats/xmlformat-doc.c

Modified: trunk/formats/xmlformat-doc.c
==============================================================================
--- trunk/formats/xmlformat-doc.c	Sun Jan  4 22:46:52 2009	(r5006)
+++ trunk/formats/xmlformat-doc.c	Mon Jan  5 02:29:40 2009	(r5007)
@@ -28,14 +28,6 @@
 #include <opensync/opensync-xmlformat.h>
 #include <opensync/opensync-format.h>
 
-osync_bool convert_func(char *input, unsigned int inpsize, char **output, unsigned int *outpsize, osync_bool *free_input, const char *config, void *userdata, OSyncError **error)
-{
-	*free_input = TRUE;
-	*output = g_strdup(input);
-	*outpsize = inpsize;
-	return TRUE;
-}
-
 static osync_bool detect_plain_as_xmlformat(const char *objtype, const char *data, int size)
 {
 	GString *string = NULL;
@@ -151,7 +143,6 @@
 
 	OSyncObjFormat *fromformat = osync_format_env_find_objformat(env, fromname);
 	OSyncObjFormat *toformat = osync_format_env_find_objformat(env, toname);
-	OSyncObjFormat *plain = osync_format_env_find_objformat(env, "plain");
 
 	if (!fromformat || !toformat) {
 		osync_trace(TRACE_ERROR, "Unable to register converter for %s->%s, format not found\n", fromname, toname);
@@ -172,17 +163,6 @@
 	if (!conv) {
 		osync_trace(TRACE_ERROR, "Unable to register converter: %s", osync_error_print(&error));
 		osync_error_unref(&error);
-		return FALSE;
-	}
-	osync_format_env_register_converter(env, conv);
-	osync_converter_unref(conv);
-
-
-	/* plain as xmlformat */
-	conv = osync_converter_new(OSYNC_CONVERTER_DECAP, plain, fromformat, convert_func, &error);
-	if (!conv) {
-		osync_trace(TRACE_ERROR, "Unable to register converter: %s", osync_error_print(&error));
-		osync_error_unref(&error);
 		return FALSE;
 	}
 	osync_format_env_register_converter(env, conv);