Changeset 3326

Timestamp:

05/22/08 11:44:39 (4 months ago)

Author:

dgollub

Message:

Introduced osync_message_read_uint() and osync_message_write_uint()
function for easy (de)marshaling of unsigned integers.

Files:

• trunk/opensync/ipc/opensync_message.c (modified) (2 diffs)
• trunk/opensync/ipc/opensync_message.h (modified) (2 diffs)

trunk/opensync/ipc/opensync_message.c

@@ -340 +340 @@
-{
-        g_byte_array_append( message->buffer, (unsigned char*)&value, sizeof( int ) );
+}
+
+/*! @brief Appends an unsigned integer value to serialized message buffer
+ * 
+ * @param message The message
+ * @param value The integer value to append
+ */
+void osync_message_write_uint(OSyncMessage *message, unsigned int value)
+{
+        g_byte_array_append( message->buffer, (unsigned char*)&value, sizeof( unsigned int ) );
-}
-
@@ -413 +423 @@
-        memcpy(value, &(message->buffer->data[ message->buffer_read_pos ]), sizeof(int));
-        message->buffer_read_pos += sizeof(int);
+}
+
+/*! @brief Read serialized unsigned integer from message buffer. This increments the read
+ * position of the message buffer.
+ *
+ * @param message The message
+ * @param value Reference to store the integer value 
+ */
+void osync_message_read_uint(OSyncMessage *message, unsigned int *value)
+{
+        osync_assert(message->buffer->len >= message->buffer_read_pos + sizeof(unsigned int));
+        
+        memcpy(value, &(message->buffer->data[ message->buffer_read_pos ]), sizeof(unsigned int));
+        message->buffer_read_pos += sizeof(unsigned int);
-}
-

trunk/opensync/ipc/opensync_message.h

@@ -95 +95 @@
-
-OSYNC_EXPORT void osync_message_write_int(OSyncMessage *message, int value);
+OSYNC_EXPORT void osync_message_write_uint(OSyncMessage *message, unsigned int value);
-OSYNC_EXPORT void osync_message_write_long_long_int(OSyncMessage *message, long long int value);
-OSYNC_EXPORT void osync_message_write_string(OSyncMessage *message, const char *value);
@@ -101 +102 @@
-
-OSYNC_EXPORT void osync_message_read_int(OSyncMessage *message, int *value);
+OSYNC_EXPORT void osync_message_read_uint(OSyncMessage *message, unsigned int *value);
-OSYNC_EXPORT void osync_message_read_long_long_int(OSyncMessage *message, long long int *value);
-OSYNC_EXPORT void osync_message_read_string(OSyncMessage *message, char **value);