[Opensync-commits] r5112 - format-plugins/vformat/tools

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

Author: cstender
Date: Sun Jan 11 18:27:21 2009
New Revision: 5112
URL: http://www.opensync.org/changeset/5112

Log:
removed call to osync_format_env_detect_objformat_full because we don't
get encapsulated formats in vconvert.

Modified:
   format-plugins/vformat/tools/vconvert.c

Modified: format-plugins/vformat/tools/vconvert.c
==============================================================================
--- format-plugins/vformat/tools/vconvert.c	Sun Jan 11 18:27:09 2009	(r5111)
+++ format-plugins/vformat/tools/vconvert.c	Sun Jan 11 18:27:21 2009	(r5112)
@@ -316,21 +316,14 @@
 		goto error;
 	}
 
-	// detect source and target xmlformat. First update the initial objformat.
-	// Then run decapsulator driven detection.
+	// detect source and target xmlformat
 	sourceformat = osync_format_env_detect_objformat(format_env, data);
 	if (sourceformat)
 		osync_data_set_objformat(data, sourceformat);
 
-	sourceformat = osync_format_env_detect_objformat_full(format_env, data, &error);
-	if (sourceformat)
-		osync_data_set_objformat(data, sourceformat);
-
 	if (osync_error_is_set(&error))
 		goto error;
 
-	sourceformat = osync_data_get_objformat(data);
-
 	targetformat = conv_run_detection(format_env, osync_objformat_get_name(sourceformat), type);
 	if (!targetformat) {
 		goto error;