Menu
▾
▴
[Opensync-commits] r5003 - in trunk/opensync: format ipc
|
From: <dg...@su...> - 2009-01-04 22:35:55
|
Author: dgollub Date: Sun Jan 4 22:35:17 2009 New Revision: 5003 URL: http://www.opensync.org/changeset/5003 Log: Replace OSyncMessage* argument in object format marshal/demarshal calls by OSyncMarshal*. OSyncMarshal allows a simpler interface to marshal data, without the OSyncMessage interface overhead. Porting instruction for format-plugins using the OSyncMessage interface for the marshaling calls marshal/demarshal: %s/OSyncMessage/OSyncMarshal/g %s/osync_message/osync_marshal/g Modified: trunk/opensync/format/opensync_objformat.c trunk/opensync/format/opensync_objformat.h trunk/opensync/format/opensync_objformat_internals.h trunk/opensync/ipc/opensync_serializer.c Modified: trunk/opensync/format/opensync_objformat.c ============================================================================== --- trunk/opensync/format/opensync_objformat.c Sun Jan 4 22:32:48 2009 (r5002) +++ trunk/opensync/format/opensync_objformat.c Sun Jan 4 22:35:17 2009 (r5003) @@ -260,11 +260,11 @@ return format->marshal_func ? TRUE : FALSE; } -osync_bool osync_objformat_marshal(OSyncObjFormat *format, const char *input, unsigned int inpsize, OSyncMessage *message, OSyncError **error) +osync_bool osync_objformat_marshal(OSyncObjFormat *format, const char *input, unsigned int inpsize, OSyncMarshal *marshal, OSyncError **error) { osync_assert(format); osync_return_val_if_fail(format->marshal_func, TRUE); - return format->marshal_func(input, inpsize, message, error); + return format->marshal_func(input, inpsize, marshal, error); } void osync_objformat_set_demarshal_func(OSyncObjFormat *format, OSyncFormatDemarshalFunc demarshal_func) @@ -273,11 +273,11 @@ format->demarshal_func = demarshal_func; } -osync_bool osync_objformat_demarshal(OSyncObjFormat *format, OSyncMessage *message, char **output, unsigned int *outpsize, OSyncError **error) +osync_bool osync_objformat_demarshal(OSyncObjFormat *format, OSyncMarshal *marshal, char **output, unsigned int *outpsize, OSyncError **error) { osync_assert(format); osync_return_val_if_fail(format->demarshal_func, TRUE); - return format->demarshal_func(message, output, outpsize, error); + return format->demarshal_func(marshal, output, outpsize, error); } void osync_objformat_set_validate_func(OSyncObjFormat *format, OSyncFormatValidateFunc validate_func) Modified: trunk/opensync/format/opensync_objformat.h ============================================================================== --- trunk/opensync/format/opensync_objformat.h Sun Jan 4 22:32:48 2009 (r5002) +++ trunk/opensync/format/opensync_objformat.h Sun Jan 4 22:35:17 2009 (r5003) @@ -40,8 +40,8 @@ typedef void (* OSyncFormatDestroyFunc) (char *data, unsigned int size); typedef char *(* OSyncFormatPrintFunc) (const char *data, unsigned int size); typedef time_t (* OSyncFormatRevisionFunc) (const char *data, unsigned int size, OSyncError **error); -typedef osync_bool (* OSyncFormatMarshalFunc) (const char *input, unsigned int inpsize, OSyncMessage *message, OSyncError **error); -typedef osync_bool (* OSyncFormatDemarshalFunc) (OSyncMessage *message, char **output, unsigned int *outpsize, OSyncError **error); +typedef osync_bool (* OSyncFormatMarshalFunc) (const char *input, unsigned int inpsize, OSyncMarshal *marshal, OSyncError **error); +typedef osync_bool (* OSyncFormatDemarshalFunc) (OSyncMarshal *marshal, char **output, unsigned int *outpsize, OSyncError **error); typedef osync_bool (* OSyncFormatValidateFunc) (const char *data, unsigned int size, void *user_data, OSyncError **error); typedef osync_bool (* OSyncFormatMergeFunc) (const char *input, unsigned int inpsize, char **output, unsigned int *outpsize, const char *entire, unsigned int entsize, OSyncCapabilities *caps, OSyncError **error); Modified: trunk/opensync/format/opensync_objformat_internals.h ============================================================================== --- trunk/opensync/format/opensync_objformat_internals.h Sun Jan 4 22:32:48 2009 (r5002) +++ trunk/opensync/format/opensync_objformat_internals.h Sun Jan 4 22:35:17 2009 (r5003) @@ -131,28 +131,28 @@ OSYNC_TEST_EXPORT osync_bool osync_objformat_must_marshal(OSyncObjFormat *format); /** - * @brief Marshals supplied input in format specific way into a serialized OSyncMessage + * @brief Marshals supplied input in format specific way into a serialized OSyncMarshal * * @param format Pointer to the object format * @param input Data to marshal * @param inpsize Size of supplied data - * @param message Marshaled data in a OSyncMessage + * @param marshal Marshaled data in a OSyncMarshal * @param error Pointer to an error struct * @returns TRUE on success, FALSE otherwise */ -OSYNC_TEST_EXPORT osync_bool osync_objformat_marshal(OSyncObjFormat *format, const char *input, unsigned int inpsize, OSyncMessage *message, OSyncError **error); +OSYNC_TEST_EXPORT osync_bool osync_objformat_marshal(OSyncObjFormat *format, const char *input, unsigned int inpsize, OSyncMarshal *marshal, OSyncError **error); /** - * @brief Demarshals supplied OSyncMessage in format specific way + * @brief Demarshals supplied OSyncMarshal in format specific way * * @param format Pointer to the object format - * @param message Marshaled data as OSyncMessage + * @param marshal Marshaled data as OSyncMarshal * @param output Data to store unserialized Message content * @param outpsize Size of demarshled data in output parameter * @param error Pointer to an error struct * @returns TRUE on success, FALSE otherwise */ -OSYNC_TEST_EXPORT osync_bool osync_objformat_demarshal(OSyncObjFormat *format, OSyncMessage *message, char **output, unsigned int *outpsize, OSyncError **error); +OSYNC_TEST_EXPORT osync_bool osync_objformat_demarshal(OSyncObjFormat *format, OSyncMarshal *marshal, char **output, unsigned int *outpsize, OSyncError **error); /** * @brief Validate supplied data in format specific way Modified: trunk/opensync/ipc/opensync_serializer.c ============================================================================== --- trunk/opensync/ipc/opensync_serializer.c Sun Jan 4 22:32:48 2009 (r5002) +++ trunk/opensync/ipc/opensync_serializer.c Sun Jan 4 22:35:17 2009 (r5003) @@ -65,7 +65,8 @@ /* If the format must be marshalled, we call the marshal function * and the send the marshalled data. Otherwise we send the unmarshalled data */ if (osync_objformat_must_marshal(objformat) == TRUE) { - if (!osync_objformat_marshal(objformat, input_data, input_size, message, error)) + OSyncMarshal *marshal = osync_message_get_marshal(message); + if (!osync_objformat_marshal(objformat, input_data, input_size, marshal, error)) goto error; } else { /* If the format is a plain format, then we have to add @@ -119,7 +120,8 @@ if (has_data) { if (osync_objformat_must_marshal(format) == TRUE) { - if (!osync_objformat_demarshal(format, message, &input_data, &input_size, error)) + OSyncMarshal *marshal = osync_message_get_marshal(message); + if (!osync_objformat_demarshal(format, marshal, &input_data, &input_size, error)) goto error; } else { osync_message_read_buffer(message, (void *)&input_data, (int *)&input_size); |
