Changeset 3548

Timestamp:

08/17/08 19:11:39 (4 months ago)

Author:

dgollub

Message:

Dropped osync_data_get_data_ptr().
As disucssed on opensync-devel mailinglist:
http://article.gmane.org/gmane.comp.misc.opensync.devel/2974

Location:

trunk

Files:

• opensync.sym (modified) (1 diff)
• opensync/data/opensync_data.c (modified) (1 diff)
• opensync/data/opensync_data.h (modified) (1 diff)
• opensync/engine/opensync_engine.c (modified) (2 diffs)
• opensync/engine/opensync_obj_engine.c (modified) (1 diff)

trunk/opensync.sym

@@ -123 +123 @@
 osync_data_compare
 osync_data_get_data
-osync_data_get_data_ptr
 osync_data_get_objformat
 osync_data_get_objtype

trunk/opensync/data/opensync_data.c

@@ -176 +176 @@
 }
 
-/*! @brief Get a pointer to the data from a data object
- * 
- * @param data The data object
- * @returns a pointer to the data. Do not free this.
- * 
- */
-void *osync_data_get_data_ptr(OSyncData *data)
-{
-        osync_assert(data);
-        return data->data;
-}
-
 /*! @brief Get the data from a data object and then clear the data object's pointers to it
  * 

trunk/opensync/data/opensync_data.h

@@ -32 +32 @@
 
 OSYNC_EXPORT void osync_data_get_data(OSyncData *data, char **buffer, unsigned int *size);
-OSYNC_EXPORT void *osync_data_get_data_ptr(OSyncData *data);
 OSYNC_EXPORT void osync_data_steal_data(OSyncData *data, char **buffer, unsigned int *size);
 OSYNC_EXPORT void osync_data_set_data(OSyncData *data, char *buffer, unsigned int size);

trunk/opensync/engine/opensync_engine.c

@@ -222 +222 @@
                 osync_trace(TRACE_INTERNAL, "Merge the XMLFormat.");
                 char *buffer = NULL;
-                unsigned int size = 0;
+                unsigned int xmlformat_size = 0, size = 0;
                 OSyncXMLFormat *xmlformat = NULL;
                 OSyncXMLFormat *xmlformat_entire = NULL;
@@ -244 +244 @@
                                         goto error;
                                         
-                                xmlformat = (OSyncXMLFormat *) osync_data_get_data_ptr(osync_change_get_data(change));
+                                osync_data_get_data(osync_change_get_data(change), (char **) &xmlformat, &xmlformat_size);
+                                osync_assert(xmlformat_size == osync_xmlformat_size());
+
                                 osync_merger_merge(merger, xmlformat, xmlformat_entire);
                                 osync_xmlformat_unref(xmlformat_entire);

trunk/opensync/engine/opensync_obj_engine.c

@@ -943 +943 @@
                                                 osync_trace(TRACE_INTERNAL, "Save the entire XMLFormat and demerge.");
                                                 char *buffer = NULL;
-                                                unsigned int size = 0;
+                                                unsigned int xmlformat_size = 0, size = 0;
                                                 OSyncXMLFormat *xmlformat = NULL;
                                                 const char *objtype = osync_change_get_objtype(entry_engine->change);
                                                 OSyncMapping *mapping = entry_engine->mapping_engine->mapping;
                                                 
-                                                xmlformat = (OSyncXMLFormat *) osync_data_get_data_ptr(osync_change_get_data(entry_engine->change));
+                                                osync_data_get_data(osync_change_get_data(entry_engine->change), (char **) &xmlformat, &xmlformat_size);
+                                                osync_assert(xmlformat_size == osync_xmlformat_size());
+
                                                 if(!osync_xmlformat_assemble(xmlformat, &buffer, &size)) {
                                                         osync_error_set(error, OSYNC_ERROR_GENERIC, "Could not assamble the xmlformat");