Changeset 5425

Timestamp:

03/17/08 11:53:07 (4 months ago)

Author:

morris

Message:

Add functions to create messages from data and data from messages

Files:

• libwired/trunk/libwired/p7/wi-p7-message.c (modified) (3 diffs)
• libwired/trunk/libwired/p7/wi-p7-message.h (modified) (2 diffs)

libwired/trunk/libwired/p7/wi-p7-message.c

@@ -107 +107 @@
-
-
+wi_p7_message_t * wi_p7_message_with_data(wi_data_t *data, wi_p7_serialization_t serialization, wi_p7_spec_t *p7_spec) {
+        return wi_autorelease(wi_p7_message_init_with_data(wi_p7_message_alloc(), data, serialization, p7_spec));
+}
+
+
+
-#pragma mark -
-
@@ -137 +143 @@
-        }
-        
+        return p7_message;
+}
+
+
+
+wi_p7_message_t * wi_p7_message_init_with_data(wi_p7_message_t *p7_message, wi_data_t *data, wi_p7_serialization_t serialization, wi_p7_spec_t *p7_spec) {
+        p7_message->spec                        = wi_retain(p7_spec);
+        p7_message->serialization       = serialization;
+        
+        if(serialization == WI_P7_BINARY) {
+                p7_message->binary_size         = wi_data_length(data);
+                p7_message->binary_capacity     = p7_message->binary_size;
+                p7_message->binary_buffer       = wi_malloc(p7_message->binary_capacity);
+                
+                memcpy(p7_message->binary_buffer, wi_data_bytes(data), p7_message->binary_size);
+        } else {
+                p7_message->xml_length          = wi_data_length(data);
+                p7_message->xml_buffer          = wi_malloc(p7_message->xml_length + 1);
+                
+                memcpy(p7_message->xml_buffer, wi_data_bytes(data), p7_message->xml_length);
+                
+                p7_message->xml_buffer[p7_message->xml_length] = '\0';
+        }
+        
+        wi_p7_message_deserialize(p7_message);
+        
+        if(!p7_message->name) {
+                wi_error_set_libwired_error(WI_ERROR_P7_UNKNOWNMESSAGE);
+                
+                wi_release(p7_message);
+                
+                return NULL;
+        }
+
-        return p7_message;
-}
@@ -990 +1030 @@
-
-
+wi_data_t * wi_p7_message_data_with_serialization(wi_p7_message_t *p7_message, wi_p7_serialization_t serialization) {
+        wi_p7_message_serialize(p7_message, serialization);
+        
+        if(serialization == WI_P7_BINARY)
+                return wi_data_with_bytes(p7_message->binary_buffer, p7_message->binary_size);
+        else
+                return wi_data_with_bytes(p7_message->xml_buffer, p7_message->xml_length);
+}
+
+
+
-#pragma mark -
-

libwired/trunk/libwired/p7/wi-p7-message.h

@@ -76 +76 @@
-
-WI_EXPORT wi_p7_message_t *                     wi_p7_message_with_name(wi_string_t *, wi_p7_spec_t *);
+WI_EXPORT wi_p7_message_t *                     wi_p7_message_with_data(wi_data_t *, wi_p7_serialization_t, wi_p7_spec_t *);
-
-WI_EXPORT wi_p7_message_t *                     wi_p7_message_alloc(void);
-WI_EXPORT wi_p7_message_t *                     wi_p7_message_init_with_name(wi_p7_message_t *, wi_string_t *, wi_p7_spec_t *);
+WI_EXPORT wi_p7_message_t *                     wi_p7_message_init_with_data(wi_p7_message_t *, wi_data_t *, wi_p7_serialization_t, wi_p7_spec_t *);
-
-WI_EXPORT wi_boolean_t                          wi_p7_message_set_name(wi_p7_message_t *, wi_string_t *);
@@ -85 +87 @@
-WI_EXPORT wi_p7_serialization_t         wi_p7_message_serialization(wi_p7_message_t *);
-WI_EXPORT wi_hash_t *                           wi_p7_message_fields(wi_p7_message_t *);
+WI_EXPORT wi_data_t *                           wi_p7_message_data_with_serialization(wi_p7_message_t *, wi_p7_serialization_t);
-
-WI_EXPORT wi_boolean_t                          wi_p7_message_set_bool_for_name(wi_p7_message_t *, wi_p7_boolean_t, wi_string_t *);