Changeset 281

Timestamp:

02/23/05 15:45:50 (4 years ago)

Author:

azrael

Message:

Updated version to 0.11

Fixed a crash when the conversion failed during a commit

Files:

• trunk/Doxyfile (modified) (1 diff)
• trunk/configure.in (modified) (1 diff)
• trunk/formats/vformats-xml/xml-vcard.c (modified) (1 diff)
• trunk/opensync/opensync_convert.c (modified) (7 diffs)
• trunk/opensync/opensync_format_internals.h (modified) (1 diff)
• trunk/opensync/opensync_member.c (modified) (1 diff)

trunk/Doxyfile

@@ -24 +24 @@
-# if some version control system is used.
-
-0
+1
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 

trunk/configure.in

@@ -3 +3 @@
-AC_PREREQ(2.58)
-AC_INIT(configure.in)
-0
+1
-AM_CONFIG_HEADER(config.h)
-

trunk/formats/vformats-xml/xml-vcard.c

@@ -401 +401 @@
-        EVCardAttribute *attr = NULL;
-        xmlNode *root = osxml_node_get_root((xmlDoc *)input, "contact", error);
-
+
+
+
-                return FALSE;
+        }
-        
-        g_type_init();

trunk/opensync/opensync_convert.c

@@ -135 +135 @@
-osync_bool osync_converter_invoke(OSyncFormatConverter *converter, OSyncChange *change, OSyncError **error)
-{
- %i
+
-        osync_trace(TRACE_INTERNAL, "converter: Type: %i, source: %s, target %s", converter->type, converter->source_format->name, converter->target_format->name);
-        char *data = NULL;
@@ -149 +149 @@
-                //Invoke the converter and all extensions
-                osync_conv_invoke_extensions(converter->source_format, FALSE, change);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                }
-                                converter->target_format->copy_func(data, datasize, &data, &datasize);
-                        }
+                        /* Free the data, unless the converter took the ownership of the data */
+                        if (free_input) {
+                                if (converter->source_format->destroy_func) {
+                                        converter->source_format->destroy_func(change->data, change->size);
+                                } else
+                                        osync_debug("OSYNC", 1, "Format %s don't have a destroy function. Possible memory leak", converter->source_format->name);
+                        }
+                        change->data = data;
+                        change->size = datasize;
+                        
+                        osync_conv_invoke_extensions(converter->target_format, TRUE, change);
-                }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-                osync_trace(TRACE_EXIT, "osync_converter_invoke: TRUE");
-
+} 
-                osync_trace(TRACE_EXIT_ERROR, "osync_converter_invoke: %s", osync_error_print(error));
-        return ret;
@@ -467 +468 @@
-        
-free_tree:
-        osync_trace(TRACE_INTERNAL, "Invoked detector for converter from TRUE1");
-        g_list_free(tree->unused);
-        osync_trace(TRACE_INTERNAL, "Invoked detector for converter from  TRUE2");
-        g_list_free(tree->search);
-        osync_trace(TRACE_INTERNAL, "Invoked detector for converter from  TRUE3 %p", tree);
-        g_free(tree);
-        osync_trace(TRACE_INTERNAL, "Invoked detector for converter from  TRUE4");
-        if (ret)
-                osync_trace(TRACE_EXIT, "osync_conv_find_path_fn: TRUE");
@@ -617 +614 @@
-/** Convert a change to the nearest format sink on a member
- */
-
-
-NULL
+, OSyncError **error
+
+error
-}
-
@@ -871 +868 @@
-
-        OSyncError *error = NULL;
-
-
+
-                osync_trace(TRACE_INTERNAL, "osync_change_compare: %s", osync_error_print(&error));
-                osync_error_free(&error);
@@ -878 +874 @@
-                return CONV_DATA_MISMATCH;
-        }
-
-
+
-                osync_trace(TRACE_INTERNAL, "osync_change_compare: %s", osync_error_print(&error));
-                osync_error_free(&error);
@@ -947 +942 @@
-                osync_error_set(error, OSYNC_ERROR_GENERIC, "The change has no objtype");
-                osync_trace(TRACE_EXIT_ERROR, "osync_change_convert_to_common: %s", osync_error_print(error));
+                return FALSE;
-        }
-        OSyncFormatEnv *env = change->objtype->env;

trunk/opensync/opensync_format_internals.h

@@ -105 +105 @@
-osync_bool osync_conv_convert_fn(OSyncFormatEnv *env, OSyncChange *change, OSyncPathTargetFn target_fn, const void *fndata, OSyncError **error);
-osync_bool osync_conv_convert_fmtlist(OSyncFormatEnv *env, OSyncChange *change, GList/*OSyncObjFormat * */ *targets);
-
+, OSyncError **error
-OSyncDataDetector *osync_env_find_detector(OSyncEnv *env, const char *sourcename, const char *targetname);
-osync_bool osync_conv_objtype_is_any(const char *objstr);

trunk/opensync/opensync_member.c

@@ -517 +517 @@
-                 * because not detection/conversion will be run
-                 */
-
+
+
-                        osync_debug("OSYNC", 0, "Unable to convert to any format on the plugin");
-                        osync_context_report_error(context, OSYNC_ERROR_CONVERT, "Unable to convert change");
+                        osync_error_free(&error);
-                        return;
-                }