Changeset 3642

Timestamp:

09/07/08 19:30:51 (3 months ago)

Author:

paule

Message:

Fix for change to osync_xmlformat_validate; add missing includes

Files:

• plugins/opie-sync/src/opie_format.c (modified) (7 diffs)

plugins/opie-sync/src/opie_format.c

@@ -27 +27 @@
 #include "opie_format.h"
 
+#include <string.h>
+
 #include <opensync/opensync.h>
 #include <opensync/opensync-time.h>
@@ -32 +34 @@
 #include <opensync/opensync-data.h>
 #include <opensync/opensync-merger.h>
+#include <opensync/opensync-xmlformat.h>
 
 enum OpieTodoState {
@@ -296 +299 @@
         g_free(str);
 
-        if (osync_xmlformat_validate(out_xmlformat) == FALSE)
-                osync_trace(TRACE_INTERNAL, "XMLFORMAT CONTACT: Not valid!");
-        else
-                osync_trace(TRACE_INTERNAL, "XMLFORMAT CONTACT: VALID");
+        if (!osync_xmlformat_validate(out_xmlformat, error))
+                goto error;
 
         osync_trace(TRACE_EXIT, "%s", __func__);
@@ -700 +701 @@
         g_free(str);
 
-        if (osync_xmlformat_validate(out_xmlformat) == FALSE)
-                osync_trace(TRACE_INTERNAL, "XMLFORMAT TODO: Not valid!");
-        else
-                osync_trace(TRACE_INTERNAL, "XMLFORMAT TODO: VALID");
+        if (!osync_xmlformat_validate(out_xmlformat, error))
+                goto error;
         
         osync_trace(TRACE_EXIT, "%s", __func__);
@@ -709 +708 @@
 
 error:
-                osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(error));
+        osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(error));
         return FALSE;
 }
@@ -1043 +1042 @@
         g_free(str);
 
-        if (osync_xmlformat_validate(out_xmlformat) == FALSE)
-                osync_trace(TRACE_INTERNAL, "XMLFORMAT EVENT: Not valid!");
-        else
-                osync_trace(TRACE_INTERNAL, "XMLFORMAT EVENT: VALID");
+        if (!osync_xmlformat_validate(out_xmlformat, error))
+                goto error;
         
         osync_trace(TRACE_EXIT, "%s", __func__);
@@ -1208 +1205 @@
         g_free(str);
 
-        if (osync_xmlformat_validate(out_xmlformat) == FALSE)
-                osync_trace(TRACE_INTERNAL, "XMLFORMAT NOTE: Not valid!");
-        else
-                osync_trace(TRACE_INTERNAL, "XMLFORMAT NOTE: VALID");
+        if (!osync_xmlformat_validate(out_xmlformat, error))
+                goto error;
         
         osync_trace(TRACE_EXIT, "%s", __func__);