Changeset 3316

Timestamp:

05/04/08 22:39:46 (3 months ago)

Author:

dgollub

Message:

Added marshal/demarshal functions for OSyncObjFormatSink

Files:

• trunk/opensync/ipc/opensync_serializer.c (modified) (17 diffs)
• trunk/opensync/ipc/opensync_serializer.h (modified) (1 diff)

trunk/opensync/ipc/opensync_serializer.c

@@ -31 +31 @@
-osync_bool osync_marshal_data(OSyncMessage *message, OSyncData *data, OSyncError **error)
-{
+        osync_assert(message);
+        osync_assert(data);
+
-        /* Order:
-         * 
@@ -46 +49 @@
-        /* Write the format and objtype first */
-        osync_message_write_string(message, osync_objformat_get_name(objformat));
-        osync_message_write_string(message, osync_objformat_get_config(objformat));
-        osync_message_write_string(message, osync_data_get_objtype(data));
-
@@ -82 +84 @@
-osync_bool osync_demarshal_data(OSyncMessage *message, OSyncData **data, OSyncFormatEnv *env, OSyncError **error)
-{
+        osync_assert(message);
+        osync_assert(env);
+
-        /* Order:
-         * 
@@ -91 +96 @@
-        /* Get the objtype and format */
-        char *objformat = NULL;
-        char *objformat_config = NULL;
-        char *objtype = NULL;
-        osync_message_read_string(message, &objformat);
-        osync_message_read_string(message, &objformat_config);
-        osync_message_read_string(message, &objtype);
-        
@@ -103 +106 @@
-                goto error;
-        }
-        osync_objformat_set_config(format, objformat_config);
-        g_free(objformat_config);
-
-        unsigned int input_size = 0;
@@ -147 +148 @@
-osync_bool osync_marshal_change(OSyncMessage *message, OSyncChange *change, OSyncError **error)
-{
+        osync_assert(message);
+        osync_assert(change);
+
-        /* Order:
-         * 
@@ -170 +174 @@
-osync_bool osync_demarshal_change(OSyncMessage *message, OSyncChange **change, OSyncFormatEnv *env, OSyncError **error)
-{
+        osync_assert(message);
+        osync_assert(env);
+
-        /* Order:
-         * 
@@ -213 +220 @@
-}
-
+osync_bool osync_marshal_objformat_sink(OSyncMessage *message, OSyncObjFormatSink *sink, OSyncError **error)
+{
+        /* Order:
+         * 
+         * objformat name
+         * objformat sink config
+         */
+
+        const char *objformat_name = osync_objformat_sink_get_objformat(sink);
+        const char *objformat_sink_config = osync_objformat_sink_get_config(sink);
+
+        osync_message_write_string(message, objformat_name); 
+        osync_message_write_string(message, objformat_sink_config); 
+        
+        return TRUE;
+}
+
+osync_bool osync_demarshal_objformat_sink(OSyncMessage *message, OSyncObjFormatSink **sink, OSyncError **error)
+{
+        osync_assert(message);
+
+        /* Order:
+         * 
+         * objformat name
+         * objformat sink config
+         */
+        
+        /* Get the objtype and format */
+        char *objformat_name = NULL;
+        char *objformat_sink_config = NULL;
+        osync_message_read_string(message, &objformat_name);
+        
+        *sink = osync_objformat_sink_new(objformat_name, error);
+        if (!*sink)
+                goto error;
+
+        osync_message_read_string(message, &objformat_sink_config);
+        osync_objformat_sink_set_config(*sink, objformat_sink_config);
+        g_free(objformat_sink_config);
+
+        return TRUE;
+
+error:
+        osync_trace(TRACE_ERROR, "%s: %s", __func__, osync_error_print(error));
+        return FALSE;
+}
+
-osync_bool osync_marshal_objtype_sink(OSyncMessage *message, OSyncObjTypeSink *sink, OSyncError **error)
-{
+        osync_assert(message);
+        osync_assert(sink);
+
-        /* Order:
-         * 
@@ -221 +278 @@
-         * get_changes function (bool)
-         * write function (bool)
-s
-list (string
+ sinks 
+sink list (format sinks
-         * enabled (int)
-         * timeout connect (int)
@@ -237 +294 @@
-        
-        int i = 0;
-int num = osync_objtype_sink_num_objformat
+unsigned int num = osync_objtype_sink_num_objformat_sink
-        osync_message_write_string(message, osync_objtype_sink_get_name(sink));
-
@@ -246 +303 @@
-        osync_message_write_int(message, num);
-        for (i = 0; i < num; i++) {
-
-
-
-
+
+
+
-        }
-        
@@ -270 +326 @@
-        
-        return TRUE;
+
+error:
+        return FALSE;
-}
-
-osync_bool osync_demarshal_objtype_sink(OSyncMessage *message, OSyncObjTypeSink **sink, OSyncError **error)
-{
+        osync_assert(message);
+
-        /* Order:
-         * 
@@ -280 +341 @@
-         * get_changes function (bool)
-         * write function (bool)
-s
-list (string
+ sinks 
+sink list (format sinks
-         * enabled (int)
-         * timeout connect (int)
@@ -303 +364 @@
-        int enabled = 0, timeout = 0;
-        int read = 0, get_changes = 0, write = 0;
-        char *format = NULL;
-        char *format_config = NULL;
-        
-        osync_message_read_string(message, &name);
@@ -322 +381 @@
-        int i = 0;
-        for (i = 0; i < num_formats; i++) {
-
-
-
-
-
+
+
+
+
+
+
-        }
-
@@ -369 +429 @@
-void osync_marshal_error(OSyncMessage *message, OSyncError *error)
-{
+        osync_assert(message);
+
-        if (error) {
-                osync_message_write_int(message, 1);
@@ -381 +443 @@
-void osync_demarshal_error(OSyncMessage *message, OSyncError **error)
-{
+        osync_assert(message);
+
-        int hasError = 0;
-

trunk/opensync/ipc/opensync_serializer.h

@@ -31 +31 @@
-void osync_demarshal_error(OSyncMessage *message, OSyncError **error);
-
+osync_bool osync_marshal_objformat_sink(OSyncMessage *message, OSyncObjFormatSink *sink, OSyncError **error);
+osync_bool osync_demarshal_objformat_sink(OSyncMessage *message, OSyncObjFormatSink **sink, OSyncError **error);
+
-osync_bool osync_marshal_objtype_sink(OSyncMessage *message, OSyncObjTypeSink *sink, OSyncError **error);
-osync_bool osync_demarshal_objtype_sink(OSyncMessage *message, OSyncObjTypeSink **sink, OSyncError **error);