Menu
▾
▴
[Opensync-commits] r1249 - in trunk: libsyncml libsyncml/data_sync_api libsyncml/objects libsyncml/parser tests
|
From: <svn...@op...> - 2009-08-07 19:35:42
|
Author: bellmich Date: Fri Aug 7 21:35:28 2009 New Revision: 1249 URL: http://libsyncml.opensync.org/changeset/1249 Log: automatic conversion from SmlChangeItem to SmlDataSyncChangeItem script follows ... set -e rm trunk/libsyncml/data_sync_api/* svn revert -R trunk svn revert -R trunk/cmake/modules FILES=`find trunk -type f -print | grep -v svn | grep -v cmake | grep -v "\.xml" | grep -v "\.wbmxl"` for FILE in $FILES; do echo -n File $FILE ... sed -i 's%SmlChangeItem%SmlDataSyncChangeItem%g' $FILE sed -i 's%sml_change_item%sml_data_sync_change_item%g' $FILE sed -i 's%CHANGE_ITEM%DATA_SYNC_CHANGE_ITEM%g' $FILE echo DONE done svn mv trunk/libsyncml/data_sync_api/sml_change_item.c trunk/libsyncml/data_sync_api/sml_data_sync_change_item.c svn mv trunk/libsyncml/data_sync_api/sml_change_item.h trunk/libsyncml/data_sync_api/sml_data_sync_change_item.h svn mv trunk/libsyncml/data_sync_api/sml_change_item_internals.h trunk/libsyncml/data_sync_api/sml_data_sync_change_item_internals.h Added: trunk/libsyncml/data_sync_api/sml_data_sync_change_item.c - copied, changed from r1230, trunk/libsyncml/data_sync_api/sml_change_item.c trunk/libsyncml/data_sync_api/sml_data_sync_change_item.h - copied, changed from r1230, trunk/libsyncml/data_sync_api/sml_change_item.h trunk/libsyncml/data_sync_api/sml_data_sync_change_item_internals.h - copied, changed from r1230, trunk/libsyncml/data_sync_api/sml_change_item_internals.h Deleted: trunk/libsyncml/data_sync_api/sml_change_item.c trunk/libsyncml/data_sync_api/sml_change_item.h trunk/libsyncml/data_sync_api/sml_change_item_internals.h Modified: trunk/libsyncml/CMakeLists.txt trunk/libsyncml/data_sync_api/data_sync.c trunk/libsyncml/data_sync_api/data_sync_callbacks.c trunk/libsyncml/data_sync_api/data_sync_callbacks.h trunk/libsyncml/data_sync_api/sml_data_sync_enum_types.c trunk/libsyncml/data_sync_api/sml_data_sync_enum_types.h trunk/libsyncml/data_sync_api/standard.h trunk/libsyncml/objects/sml_ds_server.c trunk/libsyncml/objects/sml_ds_server.h trunk/libsyncml/objects/sml_ds_server_internals.h trunk/libsyncml/parser/sml_xml_assm.c trunk/libsyncml/parser/sml_xml_parse.c trunk/libsyncml/sml_command.c trunk/libsyncml/sml_command.h trunk/libsyncml/sml_parse.c trunk/libsyncml/sml_session.c trunk/tests/check_data_sync_api_change_item.c trunk/tests/check_ds.c trunk/tests/check_session.c trunk/tests/check_sync.c trunk/tests/check_wbxml_assembler.c trunk/tests/check_xml_assembler.c trunk/tests/check_xml_parser.c trunk/tests/support.h Modified: trunk/libsyncml/CMakeLists.txt ============================================================================== --- trunk/libsyncml/CMakeLists.txt Fri Aug 7 19:57:20 2009 (r1248) +++ trunk/libsyncml/CMakeLists.txt Fri Aug 7 21:35:28 2009 (r1249) @@ -24,7 +24,7 @@ data_sync_api/data_sync_client.c data_sync_api/data_sync_server.c data_sync_api/sml_location.c - data_sync_api/sml_change_item.c + data_sync_api/sml_data_sync_change_item.c data_sync_api/sml_map_item.c data_sync_api/sml_data_sync_enum_types.c data_sync_api/transport_http_client.c @@ -82,7 +82,7 @@ INSTALL( FILES data_sync_api/sml_data_sync_enum_types.h data_sync_api/sml_location.h - data_sync_api/sml_change_item.h + data_sync_api/sml_data_sync_change_item.h data_sync_api/sml_map_item.h data_sync_api/defines.h data_sync_api/standard.h Modified: trunk/libsyncml/data_sync_api/data_sync.c ============================================================================== --- trunk/libsyncml/data_sync_api/data_sync.c Fri Aug 7 19:57:20 2009 (r1248) +++ trunk/libsyncml/data_sync_api/data_sync.c Fri Aug 7 21:35:28 2009 (r1249) @@ -39,7 +39,7 @@ #include "data_sync_loop.h" #include "transport.h" #include "libsyncml/objects/sml_ds_server.h" -#include "libsyncml/data_sync_api/sml_change_item_internals.h" +#include "libsyncml/data_sync_api/sml_data_sync_change_item_internals.h" /* ********************************* */ /* object creation and configuration */ @@ -615,22 +615,22 @@ smlAssert(type); /* create a new change */ - SmlChangeItem *change = sml_change_item_new(); + SmlDataSyncChangeItem *change = sml_data_sync_change_item_new(); /* fill the new change */ - sml_change_item_set_action(change, type); + sml_data_sync_change_item_set_action(change, type); SmlLocation *loc = sml_location_new(); sml_location_set_uri(loc, name); - if (!sml_change_item_set_location(change, loc, error)) + if (!sml_data_sync_change_item_set_location(change, loc, error)) goto error; - sml_change_item_set_userdata (change, userdata); + sml_data_sync_change_item_set_userdata (change, userdata); /* determine the datastore */ SmlDataSyncDatastore *datastore = smlDataSyncGetDatastoreFromSource(dsObject, source, error); if (!datastore) goto error; - sml_change_item_set_data_store(change, datastore); - if (!sml_change_item_set_content_type(change, datastore->contentType, error)) + sml_data_sync_change_item_set_data_store(change, datastore); + if (!sml_data_sync_change_item_set_content_type(change, datastore->contentType, error)) goto error; /* copy data */ @@ -651,10 +651,10 @@ appClassLength == strlen(SML_CONTENT_TYPE_AUDIO) ) ) { /* binary data must be base64 encoded */ - if (!sml_change_item_set_binary_data(change, data, size, error)) + if (!sml_data_sync_change_item_set_binary_data(change, data, size, error)) goto error; } else { - if (!sml_change_item_set_data(change, data, size, error)) + if (!sml_data_sync_change_item_set_data(change, data, size, error)) goto error; } } @@ -724,7 +724,7 @@ int i = 0; for (i = 0; i < num; i++) { - SmlChangeItem *change = g_list_nth_data(datastore->changes, i); + SmlDataSyncChangeItem *change = g_list_nth_data(datastore->changes, i); if (!smlDsSessionQueueChange( datastore->session, change, @@ -918,7 +918,7 @@ smlDsServerFree(datastore->server); while(datastore->changes) { - SmlChangeItem *change = datastore->changes->data; + SmlDataSyncChangeItem *change = datastore->changes->data; datastore->changes = g_list_remove( datastore->changes, change); Modified: trunk/libsyncml/data_sync_api/data_sync_callbacks.c ============================================================================== --- trunk/libsyncml/data_sync_api/data_sync_callbacks.c Fri Aug 7 19:57:20 2009 (r1248) +++ trunk/libsyncml/data_sync_api/data_sync_callbacks.c Fri Aug 7 21:35:28 2009 (r1249) @@ -30,7 +30,7 @@ #include "data_sync_devinf.h" #include "libsyncml/objects/sml_ds_server.h" #include "libsyncml/sml_manager.h" -#include "sml_change_item_internals.h" +#include "sml_data_sync_change_item_internals.h" /* **************************************** */ /* ***** Management Callbacks ***** */ @@ -542,7 +542,7 @@ gboolean smlDataSyncChangeCallback( SmlDsSession *dsession, - SmlChangeItem *item, + SmlDataSyncChangeItem *item, void *userdata, GError **error) { @@ -552,15 +552,15 @@ SmlDataSyncDatastore *datastore = userdata; smlAssert(item); - smlAssert(sml_change_item_get_action(item)); + smlAssert(sml_data_sync_change_item_get_action(item)); smlAssert(datastore); smlAssert(datastore->dsObject); smlAssert(datastore->dsObject->changeCallback); /* some mobiles sends replace commands during slow-sync */ if (datastore->alertType == SML_ALERT_SLOW_SYNC && - sml_change_item_get_action(item) == SML_CHANGE_REPLACE) - sml_change_item_set_action(item, SML_CHANGE_ADD); + sml_data_sync_change_item_get_action(item) == SML_CHANGE_REPLACE) + sml_data_sync_change_item_set_action(item, SML_CHANGE_ADD); /* decode base64 data if necessary */ gchar *data = NULL; @@ -579,22 +579,22 @@ appClassLength == strlen(SML_CONTENT_TYPE_AUDIO) ) ) { /* binary data must be base64 encoded */ - data = (char *) g_base64_decode(sml_change_item_get_data(item), &length); + data = (char *) g_base64_decode(sml_data_sync_change_item_get_data(item), &length); if (!data) { g_set_error(error, SML_ERROR, SML_ERROR_GENERIC, "The base 64 decoding of glib failed."); goto error; } } else { - data = g_strdup(sml_change_item_get_data(item)); + data = g_strdup(sml_data_sync_change_item_get_data(item)); length = strlen(data); } /* perform callback */ if (!datastore->dsObject->changeCallback( datastore->dsObject, datastore->sourceUri, - sml_change_item_get_action(item), - sml_location_get_uri(sml_change_item_get_location(item)), + sml_data_sync_change_item_get_action(item), + sml_location_get_uri(sml_data_sync_change_item_get_location(item)), data, length, datastore->dsObject->changeUserdata, error)) @@ -618,8 +618,8 @@ GError *error = NULL; smlAssert(userdata); - SmlChangeItem *change = userdata; - SmlDataSyncDatastore *datastore = sml_change_item_get_data_store(change); + SmlDataSyncChangeItem *change = userdata; + SmlDataSyncDatastore *datastore = sml_data_sync_change_item_get_data_store(change); SmlDataSyncObject *dsObject = datastore->dsObject; smlAssert(dsObject); @@ -627,7 +627,7 @@ !dsObject->changeStatusCallback( dsObject, smlStatusGetCode(status), - sml_change_item_get_userdata(change), &error)) + sml_data_sync_change_item_get_userdata(change), &error)) goto error; smlTrace(TRACE_EXIT, "%s", __func__); Modified: trunk/libsyncml/data_sync_api/data_sync_callbacks.h ============================================================================== --- trunk/libsyncml/data_sync_api/data_sync_callbacks.h Fri Aug 7 19:57:20 2009 (r1248) +++ trunk/libsyncml/data_sync_api/data_sync_callbacks.h Fri Aug 7 21:35:28 2009 (r1249) @@ -75,7 +75,7 @@ gboolean smlDataSyncChangeCallback( SmlDsSession *dsession, - SmlChangeItem *item, + SmlDataSyncChangeItem *item, void *userdata, GError **error); Copied and modified: trunk/libsyncml/data_sync_api/sml_data_sync_change_item.c (from r1230, trunk/libsyncml/data_sync_api/sml_change_item.c) ============================================================================== --- trunk/libsyncml/data_sync_api/sml_change_item.c Fri Aug 7 19:35:36 2009 (r1230, copy source) +++ trunk/libsyncml/data_sync_api/sml_data_sync_change_item.c Fri Aug 7 21:35:28 2009 (r1249) @@ -1,4 +1,4 @@ -/* sml_change_item.c +/* sml_data_sync_change_item.c * * Copyright (C) 2009 Michael Bell <mic...@op...> * @@ -18,12 +18,12 @@ * Boston, MA 02110-1301 USA */ -#include "sml_change_item_internals.h" +#include "sml_data_sync_change_item_internals.h" #include "sml_data_sync_enum_types.h" #include "../sml_error_internals.h" #include <string.h> -G_DEFINE_TYPE (SmlChangeItem, sml_change_item, G_TYPE_OBJECT) +G_DEFINE_TYPE (SmlDataSyncChangeItem, sml_data_sync_change_item, G_TYPE_OBJECT) enum { @@ -38,7 +38,7 @@ PROP_USERDATA }; -struct _SmlChangeItemPrivate +struct _SmlDataSyncChangeItemPrivate { SmlChangeType type; SmlLocation* loc; @@ -51,35 +51,35 @@ }; static void -sml_change_item_get_property (GObject *object, +sml_data_sync_change_item_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) { switch (property_id) { case PROP_TYPE: - g_value_set_enum (value, SML_CHANGE_ITEM (object)->priv->type); + g_value_set_enum (value, SML_DATA_SYNC_CHANGE_ITEM (object)->priv->type); break; case PROP_LOCATION: - g_value_set_object (value, SML_CHANGE_ITEM (object)->priv->loc); + g_value_set_object (value, SML_DATA_SYNC_CHANGE_ITEM (object)->priv->loc); break; case PROP_DATA: - g_value_set_string (value, SML_CHANGE_ITEM (object)->priv->data); + g_value_set_string (value, SML_DATA_SYNC_CHANGE_ITEM (object)->priv->data); break; case PROP_PLANNED_SIZE: - g_value_set_uint64 (value, SML_CHANGE_ITEM (object)->priv->planned_size); + g_value_set_uint64 (value, SML_DATA_SYNC_CHANGE_ITEM (object)->priv->planned_size); break; case PROP_CONTENT_TYPE: - g_value_set_string (value, SML_CHANGE_ITEM (object)->priv->content_type); + g_value_set_string (value, SML_DATA_SYNC_CHANGE_ITEM (object)->priv->content_type); break; case PROP_MISSING_DATA: - g_value_set_boolean (value, SML_CHANGE_ITEM (object)->priv->missing_data); + g_value_set_boolean (value, SML_DATA_SYNC_CHANGE_ITEM (object)->priv->missing_data); break; case PROP_DATA_STORE: - g_value_set_pointer (value, SML_CHANGE_ITEM (object)->priv->data_store); + g_value_set_pointer (value, SML_DATA_SYNC_CHANGE_ITEM (object)->priv->data_store); break; case PROP_USERDATA: - g_value_set_pointer (value, SML_CHANGE_ITEM (object)->priv->userdata); + g_value_set_pointer (value, SML_DATA_SYNC_CHANGE_ITEM (object)->priv->userdata); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); @@ -87,40 +87,40 @@ } static void -sml_change_item_set_property (GObject *object, +sml_data_sync_change_item_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) { switch (property_id) { case PROP_TYPE: - SML_CHANGE_ITEM (object)->priv->type = g_value_get_enum (value); + SML_DATA_SYNC_CHANGE_ITEM (object)->priv->type = g_value_get_enum (value); break; case PROP_LOCATION: - if (SML_CHANGE_ITEM (object)->priv->loc) - g_object_unref (SML_CHANGE_ITEM (object)->priv->loc); - SML_CHANGE_ITEM (object)->priv->loc = SML_LOCATION (value); - g_object_ref(SML_CHANGE_ITEM (object)->priv->loc); + if (SML_DATA_SYNC_CHANGE_ITEM (object)->priv->loc) + g_object_unref (SML_DATA_SYNC_CHANGE_ITEM (object)->priv->loc); + SML_DATA_SYNC_CHANGE_ITEM (object)->priv->loc = SML_LOCATION (value); + g_object_ref(SML_DATA_SYNC_CHANGE_ITEM (object)->priv->loc); break; case PROP_DATA: - g_free (SML_CHANGE_ITEM (object)->priv->data); - SML_CHANGE_ITEM (object)->priv->data = g_strdup (g_value_get_string (value)); + g_free (SML_DATA_SYNC_CHANGE_ITEM (object)->priv->data); + SML_DATA_SYNC_CHANGE_ITEM (object)->priv->data = g_strdup (g_value_get_string (value)); break; case PROP_PLANNED_SIZE: - SML_CHANGE_ITEM (object)->priv->planned_size = g_value_get_uint64 (value); + SML_DATA_SYNC_CHANGE_ITEM (object)->priv->planned_size = g_value_get_uint64 (value); break; case PROP_CONTENT_TYPE: - g_free (SML_CHANGE_ITEM (object)->priv->content_type); - SML_CHANGE_ITEM (object)->priv->content_type = g_strdup (g_value_get_string (value)); + g_free (SML_DATA_SYNC_CHANGE_ITEM (object)->priv->content_type); + SML_DATA_SYNC_CHANGE_ITEM (object)->priv->content_type = g_strdup (g_value_get_string (value)); break; case PROP_MISSING_DATA: - SML_CHANGE_ITEM (object)->priv->missing_data = g_value_get_boolean (value); + SML_DATA_SYNC_CHANGE_ITEM (object)->priv->missing_data = g_value_get_boolean (value); break; case PROP_DATA_STORE: - SML_CHANGE_ITEM (object)->priv->data_store = (SmlDataSyncDatastore *) g_value_get_pointer(value); + SML_DATA_SYNC_CHANGE_ITEM (object)->priv->data_store = (SmlDataSyncDatastore *) g_value_get_pointer(value); break; case PROP_USERDATA: - SML_CHANGE_ITEM (object)->priv->userdata = (void *) g_value_get_pointer(value); + SML_DATA_SYNC_CHANGE_ITEM (object)->priv->userdata = (void *) g_value_get_pointer(value); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); @@ -128,9 +128,9 @@ } static void -sml_change_item_finalize (GObject *object) +sml_data_sync_change_item_finalize (GObject *object) { - SmlChangeItem *self = (SmlChangeItem *) object; + SmlDataSyncChangeItem *self = (SmlDataSyncChangeItem *) object; if (self->priv->loc) g_object_unref(self->priv->loc); g_free(self->priv->data); @@ -142,22 +142,22 @@ self->priv->content_type = NULL; self->priv->data_store = NULL; self->priv->userdata = NULL; - G_OBJECT_CLASS (sml_change_item_parent_class)->finalize (object); + G_OBJECT_CLASS (sml_data_sync_change_item_parent_class)->finalize (object); } static void -sml_change_item_class_init (SmlChangeItemClass *klass) +sml_data_sync_change_item_class_init (SmlDataSyncChangeItemClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - g_type_class_add_private (klass, sizeof (SmlChangeItemPrivate)); + g_type_class_add_private (klass, sizeof (SmlDataSyncChangeItemPrivate)); - object_class->get_property = sml_change_item_get_property; - object_class->set_property = sml_change_item_set_property; - object_class->finalize = sml_change_item_finalize; + object_class->get_property = sml_data_sync_change_item_get_property; + object_class->set_property = sml_data_sync_change_item_set_property; + object_class->finalize = sml_data_sync_change_item_finalize; /** - * SmlChangeItem:location: + * SmlDataSyncChangeItem:location: * * The location property. */ @@ -169,7 +169,7 @@ G_TYPE_OBJECT, G_PARAM_READWRITE)); /** - * SmlChangeItem:data: + * SmlDataSyncChangeItem:data: * * The property. */ @@ -181,7 +181,7 @@ NULL, G_PARAM_READWRITE)); /** - * SmlChangeItem:planned_size: + * SmlDataSyncChangeItem:planned_size: * * The property. */ @@ -195,7 +195,7 @@ 0, G_PARAM_READWRITE)); /** - * SmlChangeItem:content_type: + * SmlDataSyncChangeItem:content_type: * * The property. */ @@ -207,7 +207,7 @@ NULL, G_PARAM_READWRITE)); /** - * SmlChangeItem:missing_data: + * SmlDataSyncChangeItem:missing_data: * * The MoreData flag property. */ @@ -219,7 +219,7 @@ FALSE, G_PARAM_READWRITE)); /** - * SmlChangeItem:data_store: + * SmlDataSyncChangeItem:data_store: * * The data store property. */ @@ -233,54 +233,54 @@ } static void -sml_change_item_init (SmlChangeItem *self) +sml_data_sync_change_item_init (SmlDataSyncChangeItem *self) { self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, - SML_TYPE_CHANGE_ITEM, - SmlChangeItemPrivate); + SML_TYPE_DATA_SYNC_CHANGE_ITEM, + SmlDataSyncChangeItemPrivate); } /** - * sml_change_item_new: + * sml_data_sync_change_item_new: * - * Creates a new instance of #SmlChangeItem. + * Creates a new instance of #SmlDataSyncChangeItem. * - * Return value: the newly created #SmlChangeItem instance + * Return value: the newly created #SmlDataSyncChangeItem instance */ -SmlChangeItem* -sml_change_item_new (void) +SmlDataSyncChangeItem* +sml_data_sync_change_item_new (void) { - return g_object_new (SML_TYPE_CHANGE_ITEM, NULL); + return g_object_new (SML_TYPE_DATA_SYNC_CHANGE_ITEM, NULL); } /** - * sml_change_item_get_location: - * @self: A #SmlChangeItem + * sml_data_sync_change_item_get_location: + * @self: A #SmlDataSyncChangeItem * * Gets the location property. * * Return value: */ SmlLocation* -sml_change_item_get_location (SmlChangeItem *self) +sml_data_sync_change_item_get_location (SmlDataSyncChangeItem *self) { - g_return_val_if_fail (SML_IS_CHANGE_ITEM (self), NULL); + g_return_val_if_fail (SML_IS_DATA_SYNC_CHANGE_ITEM (self), NULL); return self->priv->loc; } /** - * sml_change_item_set_location: - * @self: A #SmlChangeItem + * sml_data_sync_change_item_set_location: + * @self: A #SmlDataSyncChangeItem * @loc: * * Sets the location property. */ gboolean -sml_change_item_set_location (SmlChangeItem *self, +sml_data_sync_change_item_set_location (SmlDataSyncChangeItem *self, SmlLocation* loc, GError **error) { - sml_return_val_error_if_fail (SML_IS_CHANGE_ITEM (self), FALSE, error, SML_ERROR_GENERIC, "There must be a SmlChangeItem object."); + sml_return_val_error_if_fail (SML_IS_DATA_SYNC_CHANGE_ITEM (self), FALSE, error, SML_ERROR_GENERIC, "There must be a SmlDataSyncChangeItem object."); sml_return_val_error_if_fail (!loc || sml_location_get_uri(loc), FALSE, error, SML_ERROR_GENERIC, "The location must have an URI."); if (self->priv->loc) @@ -292,35 +292,35 @@ } /** - * sml_change_item_get_data: - * @self: A #SmlChangeItem + * sml_data_sync_change_item_get_data: + * @self: A #SmlDataSyncChangeItem * * Gets the data property. * * Return value: */ G_CONST_RETURN gchar* -sml_change_item_get_data (SmlChangeItem *self) +sml_data_sync_change_item_get_data (SmlDataSyncChangeItem *self) { - g_return_val_if_fail (SML_IS_CHANGE_ITEM (self), NULL); + g_return_val_if_fail (SML_IS_DATA_SYNC_CHANGE_ITEM (self), NULL); return self->priv->data; } /** - * sml_change_item_set_data: - * @self: A #SmlChangeItem + * sml_data_sync_change_item_set_data: + * @self: A #SmlDataSyncChangeItem * @data: * @size: * * Sets the data property. */ gboolean -sml_change_item_set_data (SmlChangeItem *self, +sml_data_sync_change_item_set_data (SmlDataSyncChangeItem *self, const gchar* data, gsize size, GError **error) { - sml_return_val_error_if_fail (SML_IS_CHANGE_ITEM (self), FALSE, error, SML_ERROR_GENERIC, "There must be a SmlChangeItem object."); + sml_return_val_error_if_fail (SML_IS_DATA_SYNC_CHANGE_ITEM (self), FALSE, error, SML_ERROR_GENERIC, "There must be a SmlDataSyncChangeItem object."); sml_return_val_error_if_fail (data != NULL, FALSE, error, SML_ERROR_GENERIC, "The data must be different from NULL."); sml_return_val_error_if_fail (strlen(data), FALSE, error, SML_ERROR_GENERIC, "The data must not be the empty word."); @@ -338,20 +338,20 @@ } /** - * sml_change_item_set_binary_data: - * @self: A #SmlChangeItem + * sml_data_sync_change_item_set_binary_data: + * @self: A #SmlDataSyncChangeItem * @data: * @size: * * Sets the data property. */ gboolean -sml_change_item_set_binary_data (SmlChangeItem *self, +sml_data_sync_change_item_set_binary_data (SmlDataSyncChangeItem *self, const gchar* data, gsize size, GError **error) { - sml_return_val_error_if_fail (SML_IS_CHANGE_ITEM (self), FALSE, error, SML_ERROR_GENERIC, "There must be a SmlChangeItem object."); + sml_return_val_error_if_fail (SML_IS_DATA_SYNC_CHANGE_ITEM (self), FALSE, error, SML_ERROR_GENERIC, "There must be a SmlDataSyncChangeItem object."); sml_return_val_error_if_fail (size, FALSE, error, SML_ERROR_GENERIC, "The size must be present."); g_free (self->priv->data); @@ -363,63 +363,63 @@ } /** - * sml_change_item_get_planned_size: - * @self: A #SmlChangeItem + * sml_data_sync_change_item_get_planned_size: + * @self: A #SmlDataSyncChangeItem * * Gets the planned size property. * * Return value: */ gsize -sml_change_item_get_planned_size (SmlChangeItem *self) +sml_data_sync_change_item_get_planned_size (SmlDataSyncChangeItem *self) { - g_return_val_if_fail (SML_IS_CHANGE_ITEM (self), 0); + g_return_val_if_fail (SML_IS_DATA_SYNC_CHANGE_ITEM (self), 0); return self->priv->planned_size; } /** - * sml_change_item_set_planned_size: - * @self: A #SmlChangeItem + * sml_data_sync_change_item_set_planned_size: + * @self: A #SmlDataSyncChangeItem * @planned_size: * * Sets the planned size property. */ void -sml_change_item_set_planned_size (SmlChangeItem *self, +sml_data_sync_change_item_set_planned_size (SmlDataSyncChangeItem *self, gsize planned_size) { - g_return_if_fail (SML_IS_CHANGE_ITEM (self)); + g_return_if_fail (SML_IS_DATA_SYNC_CHANGE_ITEM (self)); self->priv->planned_size = planned_size; } /** - * sml_change_item_get_content_type: - * @self: A #SmlChangeItem + * sml_data_sync_change_item_get_content_type: + * @self: A #SmlDataSyncChangeItem * * Gets the content-type property. * * Return value: */ G_CONST_RETURN gchar* -sml_change_item_get_content_type (SmlChangeItem *self) +sml_data_sync_change_item_get_content_type (SmlDataSyncChangeItem *self) { - g_return_val_if_fail (SML_IS_CHANGE_ITEM (self), NULL); + g_return_val_if_fail (SML_IS_DATA_SYNC_CHANGE_ITEM (self), NULL); return self->priv->content_type; } /** - * sml_change_item_set_content_type: - * @self: A #SmlChangeItem + * sml_data_sync_change_item_set_content_type: + * @self: A #SmlDataSyncChangeItem * @content_type: * * Sets the content-type property. */ gboolean -sml_change_item_set_content_type (SmlChangeItem *self, +sml_data_sync_change_item_set_content_type (SmlDataSyncChangeItem *self, const gchar* content_type, GError **error) { - sml_return_val_error_if_fail (SML_IS_CHANGE_ITEM (self), FALSE, error, SML_ERROR_GENERIC, "There must be a SmlChangeItem object."); + sml_return_val_error_if_fail (SML_IS_DATA_SYNC_CHANGE_ITEM (self), FALSE, error, SML_ERROR_GENERIC, "There must be a SmlDataSyncChangeItem object."); sml_return_val_error_if_fail (content_type != NULL, FALSE, error, SML_ERROR_GENERIC, "The content-type must be different from NULL."); sml_return_val_error_if_fail (strlen(content_type), FALSE, error, SML_ERROR_GENERIC, "The content-type must be different from the empty word."); @@ -432,161 +432,161 @@ } /** - * sml_change_item_get_missing_data: - * @self: A #SmlChangeItem + * sml_data_sync_change_item_get_missing_data: + * @self: A #SmlDataSyncChangeItem * * Gets the MoreData flag property. * * Return value: */ gboolean -sml_change_item_get_missing_data (SmlChangeItem *self) +sml_data_sync_change_item_get_missing_data (SmlDataSyncChangeItem *self) { - g_return_val_if_fail (SML_IS_CHANGE_ITEM (self), FALSE); + g_return_val_if_fail (SML_IS_DATA_SYNC_CHANGE_ITEM (self), FALSE); return self->priv->missing_data; } /** - * sml_change_item_set_missing_data: - * @self: A #SmlChangeItem + * sml_data_sync_change_item_set_missing_data: + * @self: A #SmlDataSyncChangeItem * @missing_data: * * Sets the MoreData flag property. */ void -sml_change_item_set_missing_data (SmlChangeItem *self, +sml_data_sync_change_item_set_missing_data (SmlDataSyncChangeItem *self, gboolean missing_data) { - g_return_if_fail (SML_IS_CHANGE_ITEM (self)); + g_return_if_fail (SML_IS_DATA_SYNC_CHANGE_ITEM (self)); self->priv->missing_data = missing_data; } /** - * sml_change_item_get_action: - * @self: A #SmlChangeItem + * sml_data_sync_change_item_get_action: + * @self: A #SmlDataSyncChangeItem * * Gets the change type property. * * Return value: */ SmlChangeType -sml_change_item_get_action (SmlChangeItem *self) +sml_data_sync_change_item_get_action (SmlDataSyncChangeItem *self) { - g_return_val_if_fail (SML_IS_CHANGE_ITEM (self), FALSE); + g_return_val_if_fail (SML_IS_DATA_SYNC_CHANGE_ITEM (self), FALSE); return self->priv->type; } /** - * sml_change_item_set_action: - * @self: A #SmlChangeItem + * sml_data_sync_change_item_set_action: + * @self: A #SmlDataSyncChangeItem * @missing_data: * * Sets the change type property. */ void -sml_change_item_set_action (SmlChangeItem *self, +sml_data_sync_change_item_set_action (SmlDataSyncChangeItem *self, SmlChangeType type) { - g_return_if_fail (SML_IS_CHANGE_ITEM (self)); + g_return_if_fail (SML_IS_DATA_SYNC_CHANGE_ITEM (self)); self->priv->type = type; } /** - * sml_change_item_get_data_store: - * @self: A #SmlChangeItem + * sml_data_sync_change_item_get_data_store: + * @self: A #SmlDataSyncChangeItem * * Gets the data store property. * * Return value: */ SmlDataSyncDatastore* -sml_change_item_get_data_store (SmlChangeItem *self) +sml_data_sync_change_item_get_data_store (SmlDataSyncChangeItem *self) { - g_return_val_if_fail (SML_IS_CHANGE_ITEM (self), FALSE); + g_return_val_if_fail (SML_IS_DATA_SYNC_CHANGE_ITEM (self), FALSE); return self->priv->data_store; } /** - * sml_change_item_set_data_store: - * @self: A #SmlChangeItem + * sml_data_sync_change_item_set_data_store: + * @self: A #SmlDataSyncChangeItem * @ds: * * Sets the change type property. */ void -sml_change_item_set_data_store (SmlChangeItem *self, +sml_data_sync_change_item_set_data_store (SmlDataSyncChangeItem *self, SmlDataSyncDatastore *ds) { - g_return_if_fail (SML_IS_CHANGE_ITEM (self)); + g_return_if_fail (SML_IS_DATA_SYNC_CHANGE_ITEM (self)); self->priv->data_store = ds; } /** - * sml_change_item_get_userdata: - * @self: A #SmlChangeItem + * sml_data_sync_change_item_get_userdata: + * @self: A #SmlDataSyncChangeItem * * Gets the userdata property. * * Return value: */ void* -sml_change_item_get_userdata (SmlChangeItem *self) +sml_data_sync_change_item_get_userdata (SmlDataSyncChangeItem *self) { - g_return_val_if_fail (SML_IS_CHANGE_ITEM (self), FALSE); + g_return_val_if_fail (SML_IS_DATA_SYNC_CHANGE_ITEM (self), FALSE); return self->priv->userdata; } /** - * sml_change_item_set_userdata: - * @self: A #SmlChangeItem + * sml_data_sync_change_item_set_userdata: + * @self: A #SmlDataSyncChangeItem * @userdata: * * Sets the userdata property. */ void -sml_change_item_set_userdata (SmlChangeItem *self, +sml_data_sync_change_item_set_userdata (SmlDataSyncChangeItem *self, void *userdata) { - g_return_if_fail (SML_IS_CHANGE_ITEM (self)); + g_return_if_fail (SML_IS_DATA_SYNC_CHANGE_ITEM (self)); self->priv->userdata = userdata; } /** - * sml_change_item_get_fragment: - * @self: A #SmlChangeItem + * sml_data_sync_change_item_get_fragment: + * @self: A #SmlDataSyncChangeItem * * */ -SmlChangeItem* -sml_change_item_get_fragment (SmlChangeItem *self, +SmlDataSyncChangeItem* +sml_data_sync_change_item_get_fragment (SmlDataSyncChangeItem *self, gsize start, gsize max_size, GError **error) { - sml_return_val_error_if_fail (SML_IS_CHANGE_ITEM (self), NULL, error, SML_ERROR_GENERIC, "There must be a SmlChangeItem object."); + sml_return_val_error_if_fail (SML_IS_DATA_SYNC_CHANGE_ITEM (self), NULL, error, SML_ERROR_GENERIC, "There must be a SmlDataSyncChangeItem object."); sml_return_val_error_if_fail (self->priv->data, NULL, error, SML_ERROR_GENERIC, "There must be some data."); sml_return_val_error_if_fail (max_size, NULL, error, SML_ERROR_GENERIC, "There is no maximum size set."); - SmlChangeItem *frag = sml_change_item_new(); - sml_return_val_error_if_fail (frag, NULL, error, SML_ERROR_GENERIC, "Cannot create new instance of SmlChangeItem - out of memory."); + SmlDataSyncChangeItem *frag = sml_data_sync_change_item_new(); + sml_return_val_error_if_fail (frag, NULL, error, SML_ERROR_GENERIC, "Cannot create new instance of SmlDataSyncChangeItem - out of memory."); if (start == 0 && max_size < strlen(self->priv->data)) - sml_change_item_set_planned_size(frag, strlen(self->priv->data)); + sml_data_sync_change_item_set_planned_size(frag, strlen(self->priv->data)); - if (!sml_change_item_set_data(frag, self->priv->data + start, max_size, error)) + if (!sml_data_sync_change_item_set_data(frag, self->priv->data + start, max_size, error)) goto error; if (start + max_size < strlen(self->priv->data)) - sml_change_item_set_missing_data(frag, TRUE); + sml_data_sync_change_item_set_missing_data(frag, TRUE); else - sml_change_item_set_missing_data(frag, FALSE); + sml_data_sync_change_item_set_missing_data(frag, FALSE); - if (sml_change_item_get_location(self) != NULL && - !sml_change_item_set_location(frag, sml_change_item_get_location(self), error)) + if (sml_data_sync_change_item_get_location(self) != NULL && + !sml_data_sync_change_item_set_location(frag, sml_data_sync_change_item_get_location(self), error)) goto error; - if (sml_change_item_get_content_type(self) != NULL && - !sml_change_item_set_content_type(frag, sml_change_item_get_content_type(self), error)) + if (sml_data_sync_change_item_get_content_type(self) != NULL && + !sml_data_sync_change_item_set_content_type(frag, sml_data_sync_change_item_get_content_type(self), error)) goto error; return frag; @@ -597,18 +597,18 @@ } /** - * sml_change_item_attach_fragment: - * @self: A #SmlChangeItem + * sml_data_sync_change_item_attach_fragment: + * @self: A #SmlDataSyncChangeItem * * */ gboolean -sml_change_item_attach_fragment (SmlChangeItem *self, - SmlChangeItem *frag, +sml_data_sync_change_item_attach_fragment (SmlDataSyncChangeItem *self, + SmlDataSyncChangeItem *frag, GError **error) { - sml_return_val_error_if_fail (SML_IS_CHANGE_ITEM (self), FALSE, error, SML_ERROR_GENERIC, "There must be a SmlChangeItem object."); - sml_return_val_error_if_fail (SML_IS_CHANGE_ITEM (frag), FALSE, error, SML_ERROR_GENERIC, "There must be a fragmentation object."); + sml_return_val_error_if_fail (SML_IS_DATA_SYNC_CHANGE_ITEM (self), FALSE, error, SML_ERROR_GENERIC, "There must be a SmlDataSyncChangeItem object."); + sml_return_val_error_if_fail (SML_IS_DATA_SYNC_CHANGE_ITEM (frag), FALSE, error, SML_ERROR_GENERIC, "There must be a fragmentation object."); sml_return_val_error_if_fail (frag->priv->data, FALSE, error, SML_ERROR_GENERIC, "The fragment does not contain any data."); sml_return_val_error_if_fail (strlen(frag->priv->data), FALSE, error, SML_ERROR_GENERIC, "The fragment does only contain an empty string."); sml_return_val_error_if_fail ((!self->priv->content_type && !frag->priv->content_type) || Copied and modified: trunk/libsyncml/data_sync_api/sml_data_sync_change_item.h (from r1230, trunk/libsyncml/data_sync_api/sml_change_item.h) ============================================================================== --- trunk/libsyncml/data_sync_api/sml_change_item.h Fri Aug 7 19:35:36 2009 (r1230, copy source) +++ trunk/libsyncml/data_sync_api/sml_data_sync_change_item.h Fri Aug 7 21:35:28 2009 (r1249) @@ -1,4 +1,4 @@ -/* sml_change_item.h +/* sml_data_sync_change_item.h * * Copyright (C) 2009 Michael Bell <mic...@op...> * @@ -18,8 +18,8 @@ * Boston, MA 02110-1301 USA */ -#ifndef __SML_CHANGE_ITEM_H__ -#define __SML_CHANGE_ITEM_H__ +#ifndef __SML_DATA_SYNC_CHANGE_ITEM_H__ +#define __SML_DATA_SYNC_CHANGE_ITEM_H__ #include <glib-object.h> #include <libsyncml/data_sync_api/sml_location.h> @@ -34,42 +34,42 @@ SML_CHANGE_DELETE = 3 } SmlChangeType; -#define SML_TYPE_CHANGE_ITEM (sml_change_item_get_type()) -#define SML_CHANGE_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SML_TYPE_CHANGE_ITEM, SmlChangeItem)) -#define SML_CHANGE_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SML_TYPE_CHANGE_ITEM, SmlChangeItemClass)) -#define SML_IS_CHANGE_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SML_TYPE_CHANGE_ITEM)) -#define SML_IS_CHANGE_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SML_TYPE_CHANGE_ITEM)) -#define SML_CHANGE_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SML_TYPE_CHANGE_ITEM, SmlChangeItemClass)) - -typedef struct _SmlChangeItem SmlChangeItem; -typedef struct _SmlChangeItemClass SmlChangeItemClass; -typedef struct _SmlChangeItemPrivate SmlChangeItemPrivate; +#define SML_TYPE_DATA_SYNC_CHANGE_ITEM (sml_data_sync_change_item_get_type()) +#define SML_DATA_SYNC_CHANGE_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SML_TYPE_DATA_SYNC_CHANGE_ITEM, SmlDataSyncChangeItem)) +#define SML_DATA_SYNC_CHANGE_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SML_TYPE_DATA_SYNC_CHANGE_ITEM, SmlDataSyncChangeItemClass)) +#define SML_IS_DATA_SYNC_CHANGE_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SML_TYPE_DATA_SYNC_CHANGE_ITEM)) +#define SML_IS_DATA_SYNC_CHANGE_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SML_TYPE_DATA_SYNC_CHANGE_ITEM)) +#define SML_DATA_SYNC_CHANGE_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SML_TYPE_DATA_SYNC_CHANGE_ITEM, SmlDataSyncChangeItemClass)) + +typedef struct _SmlDataSyncChangeItem SmlDataSyncChangeItem; +typedef struct _SmlDataSyncChangeItemClass SmlDataSyncChangeItemClass; +typedef struct _SmlDataSyncChangeItemPrivate SmlDataSyncChangeItemPrivate; -struct _SmlChangeItem +struct _SmlDataSyncChangeItem { GObject parent; /*< private >*/ - SmlChangeItemPrivate *priv; + SmlDataSyncChangeItemPrivate *priv; }; -struct _SmlChangeItemClass +struct _SmlDataSyncChangeItemClass { GObjectClass parent_class; }; -GType sml_change_item_get_type (void); -SmlChangeItem* sml_change_item_new (void); -SmlLocation* sml_change_item_get_location (SmlChangeItem *self); -gboolean sml_change_item_set_location (SmlChangeItem *self, SmlLocation* remote, GError **error); -G_CONST_RETURN gchar* sml_change_item_get_data (SmlChangeItem *self); -gboolean sml_change_item_set_data (SmlChangeItem *self, const gchar *data, gsize size, GError **error); -gboolean sml_change_item_set_binary_data (SmlChangeItem *self, const gchar *data, gsize size, GError **error); -G_CONST_RETURN gchar* sml_change_item_get_content_type (SmlChangeItem *self); -gboolean sml_change_item_set_content_type (SmlChangeItem *self, const gchar* content_type, GError **error); -SmlChangeType sml_change_item_get_action (SmlChangeItem *self); -void sml_change_item_set_action (SmlChangeItem *self, SmlChangeType kind); +GType sml_data_sync_change_item_get_type (void); +SmlDataSyncChangeItem* sml_data_sync_change_item_new (void); +SmlLocation* sml_data_sync_change_item_get_location (SmlDataSyncChangeItem *self); +gboolean sml_data_sync_change_item_set_location (SmlDataSyncChangeItem *self, SmlLocation* remote, GError **error); +G_CONST_RETURN gchar* sml_data_sync_change_item_get_data (SmlDataSyncChangeItem *self); +gboolean sml_data_sync_change_item_set_data (SmlDataSyncChangeItem *self, const gchar *data, gsize size, GError **error); +gboolean sml_data_sync_change_item_set_binary_data (SmlDataSyncChangeItem *self, const gchar *data, gsize size, GError **error); +G_CONST_RETURN gchar* sml_data_sync_change_item_get_content_type (SmlDataSyncChangeItem *self); +gboolean sml_data_sync_change_item_set_content_type (SmlDataSyncChangeItem *self, const gchar* content_type, GError **error); +SmlChangeType sml_data_sync_change_item_get_action (SmlDataSyncChangeItem *self); +void sml_data_sync_change_item_set_action (SmlDataSyncChangeItem *self, SmlChangeType kind); G_END_DECLS -#endif /* __SML_CHANGE_ITEM_H__ */ +#endif /* __SML_DATA_SYNC_CHANGE_ITEM_H__ */ Copied and modified: trunk/libsyncml/data_sync_api/sml_data_sync_change_item_internals.h (from r1230, trunk/libsyncml/data_sync_api/sml_change_item_internals.h) ============================================================================== --- trunk/libsyncml/data_sync_api/sml_change_item_internals.h Fri Aug 7 19:35:36 2009 (r1230, copy source) +++ trunk/libsyncml/data_sync_api/sml_data_sync_change_item_internals.h Fri Aug 7 21:35:28 2009 (r1249) @@ -1,4 +1,4 @@ -/* sml_change_item_internals.h +/* sml_data_sync_change_item_internals.h * * Copyright (C) 2009 Michael Bell <mic...@op...> * @@ -18,26 +18,26 @@ * Boston, MA 02110-1301 USA */ -#ifndef __SML_CHANGE_ITEM_INTERNALS_H__ -#define __SML_CHANGE_ITEM_INTERNALS_H__ +#ifndef __SML_DATA_SYNC_CHANGE_ITEM_INTERNALS_H__ +#define __SML_DATA_SYNC_CHANGE_ITEM_INTERNALS_H__ #include <glib-object.h> -#include <libsyncml/data_sync_api/sml_change_item.h> +#include <libsyncml/data_sync_api/sml_data_sync_change_item.h> #include <libsyncml/data_sync_api/data_sync.h> G_BEGIN_DECLS -gsize sml_change_item_get_planned_size (SmlChangeItem *self); -void sml_change_item_set_planned_size (SmlChangeItem *self, gsize planned_size); -gboolean sml_change_item_get_missing_data (SmlChangeItem *self); -void sml_change_item_set_missing_data (SmlChangeItem *self, gboolean missing_data); -gboolean sml_change_item_attach_fragment (SmlChangeItem *self, SmlChangeItem *fragment, GError **error); -SmlChangeItem* sml_change_item_get_fragment (SmlChangeItem *self, gsize start, gsize max_size, GError **error); -void* sml_change_item_get_userdata (SmlChangeItem *self); -void sml_change_item_set_userdata (SmlChangeItem *self, void *userdata); -SmlDataSyncDatastore* sml_change_item_get_data_store (SmlChangeItem *self); -void sml_change_item_set_data_store (SmlChangeItem *self, SmlDataSyncDatastore *ds); +gsize sml_data_sync_change_item_get_planned_size (SmlDataSyncChangeItem *self); +void sml_data_sync_change_item_set_planned_size (SmlDataSyncChangeItem *self, gsize planned_size); +gboolean sml_data_sync_change_item_get_missing_data (SmlDataSyncChangeItem *self); +void sml_data_sync_change_item_set_missing_data (SmlDataSyncChangeItem *self, gboolean missing_data); +gboolean sml_data_sync_change_item_attach_fragment (SmlDataSyncChangeItem *self, SmlDataSyncChangeItem *fragment, GError **error); +SmlDataSyncChangeItem* sml_data_sync_change_item_get_fragment (SmlDataSyncChangeItem *self, gsize start, gsize max_size, GError **error); +void* sml_data_sync_change_item_get_userdata (SmlDataSyncChangeItem *self); +void sml_data_sync_change_item_set_userdata (SmlDataSyncChangeItem *self, void *userdata); +SmlDataSyncDatastore* sml_data_sync_change_item_get_data_store (SmlDataSyncChangeItem *self); +void sml_data_sync_change_item_set_data_store (SmlDataSyncChangeItem *self, SmlDataSyncDatastore *ds); G_END_DECLS -#endif /* __SML_CHANGE_ITEM_INTERNALS_H__ */ +#endif /* __SML_DATA_SYNC_CHANGE_ITEM_INTERNALS_H__ */ Modified: trunk/libsyncml/data_sync_api/sml_data_sync_enum_types.c ============================================================================== --- trunk/libsyncml/data_sync_api/sml_data_sync_enum_types.c Fri Aug 7 19:57:20 2009 (r1248) +++ trunk/libsyncml/data_sync_api/sml_data_sync_enum_types.c Fri Aug 7 21:35:28 2009 (r1249) @@ -10,9 +10,9 @@ */ -/* enumerations from "sml_change_item.h" */ +/* enumerations from "sml_data_sync_change_item.h" */ -#include <libsyncml/data_sync_api/sml_change_item.h> +#include <libsyncml/data_sync_api/sml_data_sync_change_item.h> GType sml_change_type_get_type (void) Modified: trunk/libsyncml/data_sync_api/sml_data_sync_enum_types.h ============================================================================== --- trunk/libsyncml/data_sync_api/sml_data_sync_enum_types.h Fri Aug 7 19:57:20 2009 (r1248) +++ trunk/libsyncml/data_sync_api/sml_data_sync_enum_types.h Fri Aug 7 21:35:28 2009 (r1249) @@ -15,7 +15,7 @@ G_BEGIN_DECLS -/* enumerations from "sml_change_item.h" */ +/* enumerations from "sml_data_sync_change_item.h" */ GType sml_change_type_get_type (void) G_GNUC_CONST; #define SML_DATA_SYNC_TYPE_CHANGE_TYPE (sml_change_type_get_type ()) G_END_DECLS Modified: trunk/libsyncml/data_sync_api/standard.h ============================================================================== --- trunk/libsyncml/data_sync_api/standard.h Fri Aug 7 19:57:20 2009 (r1248) +++ trunk/libsyncml/data_sync_api/standard.h Fri Aug 7 21:35:28 2009 (r1249) @@ -35,7 +35,7 @@ #include <libsyncml/data_sync_api/defines.h> #include <libsyncml/data_sync_api/sml_location.h> -#include <libsyncml/data_sync_api/sml_change_item.h> +#include <libsyncml/data_sync_api/sml_data_sync_change_item.h> #include <libsyncml/data_sync_api/sml_map_item.h> #ifdef __cplusplus Modified: trunk/libsyncml/objects/sml_ds_server.c ============================================================================== --- trunk/libsyncml/objects/sml_ds_server.c Fri Aug 7 19:57:20 2009 (r1248) +++ trunk/libsyncml/objects/sml_ds_server.c Fri Aug 7 21:35:28 2009 (r1249) @@ -38,10 +38,10 @@ GList *c = NULL; for (c = dsession->pendingChanges; c; c = c->next) { SmlWriteContext *ctx = c->data; - SmlLocation *loc = sml_change_item_get_location(ctx->item); + SmlLocation *loc = sml_data_sync_change_item_get_location(ctx->item); const char *uri = sml_location_get_full_uri(loc); if (!strcmp(uid, uri) && - sml_change_item_get_action(ctx->item) == type) { + sml_data_sync_change_item_get_action(ctx->item) == type) { g_mutex_unlock(dsession->pendingChangesLock); smlTrace(TRACE_EXIT, "%s: %p", __func__, ctx); return ctx; @@ -612,7 +612,7 @@ gsize i; for (i=0; i < smlCommandGetNumChanges(cmd); i++) { - SmlChangeItem *item = smlCommandGetNthChange(cmd, i); + SmlDataSyncChangeItem *item = smlCommandGetNthChange(cmd, i); if (!item) { g_set_error(&error, SML_ERROR, SML_ERROR_GENERIC, @@ -1074,7 +1074,7 @@ //Send a change to the remote side gboolean smlDsSessionQueueChange (SmlDsSession *dsession, - SmlChangeItem *item, + SmlDataSyncChangeItem *item, SmlDsSessionChangeStatusCb callback, void *userdata, GError **error) Modified: trunk/libsyncml/objects/sml_ds_server.h ============================================================================== --- trunk/libsyncml/objects/sml_ds_server.h Fri Aug 7 19:57:20 2009 (r1248) +++ trunk/libsyncml/objects/sml_ds_server.h Fri Aug 7 21:35:28 2009 (r1249) @@ -39,7 +39,7 @@ typedef void (* SmlDsSessionConnectCb) (SmlDsSession *dsession, void *userdata); typedef gboolean (* SmlDsSessionAlertCb) (SmlDsSession *dsession, SmlAlertType type, const gchar *last, const gchar *next, void *userdata); typedef void (* SmlDsSessionSyncCb) (SmlDsSession *dsession, gsize numchanges, void *userdata); -typedef gboolean (* SmlDsSessionChangeCb) (SmlDsSession *dsession, SmlChangeItem *item, void *userdata, GError **error); +typedef gboolean (* SmlDsSessionChangeCb) (SmlDsSession *dsession, SmlDataSyncChangeItem *item, void *userdata, GError **error); typedef void (* SmlDsSessionChangeStatusCb) (SmlDsSession *dsession, SmlStatus *status, void *userdata); typedef void (* SmlDsSessionMapCb) (SmlDsSession *dsession, SmlMapItem *item, void *userdata); @@ -65,7 +65,7 @@ void smlDsSessionGetChanges (SmlDsSession *dsession, SmlDsSessionChangeCb chgCallback, void *userdata); void smlDsSessionGetSync (SmlDsSession *dsession, SmlDsSessionSyncCb chgCallback, void *userdata); gboolean smlDsSessionSendSync (SmlDsSession *dsession, gsize num_changes, SmlStatusReplyCb callback, void *userdata, GError **error); -gboolean smlDsSessionQueueChange (SmlDsSession *dsession, SmlChangeItem *item, SmlDsSessionChangeStatusCb callback, void *userdata, GError **error); +gboolean smlDsSessionQueueChange (SmlDsSession *dsession, SmlDataSyncChangeItem *item, SmlDsSessionChangeStatusCb callback, void *userdata, GError **error); gboolean smlDsSessionCloseSync (SmlDsSession *dsession, GError **error); void smlDsSessionGetMapping (SmlDsSession *dsession, SmlDsSessionMapCb mapCallback, void *userdata); gboolean smlDsSessionQueueMap (SmlDsSession *dsession, SmlMapItem *item, GError **error); Modified: trunk/libsyncml/objects/sml_ds_server_internals.h ============================================================================== --- trunk/libsyncml/objects/sml_ds_server_internals.h Fri Aug 7 19:57:20 2009 (r1248) +++ trunk/libsyncml/objects/sml_ds_server_internals.h Fri Aug 7 21:35:28 2009 (r1249) @@ -34,7 +34,7 @@ typedef struct SmlWriteContext { SmlDsSessionChangeStatusCb callback; - SmlChangeItem *item; + SmlDataSyncChangeItem *item; SmlStatus *status; void *userdata; SmlDsSession *session; Modified: trunk/libsyncml/parser/sml_xml_assm.c ============================================================================== --- trunk/libsyncml/parser/sml_xml_assm.c Fri Aug 7 19:57:20 2009 (r1248) +++ trunk/libsyncml/parser/sml_xml_assm.c Fri Aug 7 21:35:28 2009 (r1249) @@ -26,7 +26,7 @@ #include "libsyncml/sml_error_internals.h" #include "libsyncml/data_sync_api/sml_map_item_internals.h" -#include "libsyncml/data_sync_api/sml_change_item_internals.h" +#include "libsyncml/data_sync_api/sml_data_sync_change_item_internals.h" #include "sml_xml_assm_internals.h" #include <string.h> @@ -464,7 +464,7 @@ } gboolean -smlChangeItemAssemble (SmlChangeItem *item, +smlChangeItemAssemble (SmlDataSyncChangeItem *item, SmlXmlAssembler *assm, GError **error) { @@ -510,7 +510,7 @@ gboolean fillSource = TRUE; SmlSessionType sessionType = assm->session->sessionType; const char *opt = smlAssemblerGetOption(assm->assembler, "ONLY_REPLACE"); - if (sml_change_item_get_action(item) == SML_CHANGE_ADD) + if (sml_data_sync_change_item_get_action(item) == SML_CHANGE_ADD) { if (opt && atoi(opt) && /* remote peer supports ONLY_REPLACE */ sessionType == SML_SESSION_TYPE_SERVER) { @@ -531,34 +531,34 @@ } /* Target */ - if (!fillSource && sml_change_item_get_location(item)) { - if (!smlLocationAssemble(sml_change_item_get_location(item), assm, SML_ELEMENT_TARGET, error)) + if (!fillSource && sml_data_sync_change_item_get_location(item)) { + if (!smlLocationAssemble(sml_data_sync_change_item_get_location(item), assm, SML_ELEMENT_TARGET, error)) goto error; } /* Source */ - if (fillSource && sml_change_item_get_location(item)) { - if (!smlLocationAssemble(sml_change_item_get_location(item), assm, SML_ELEMENT_SOURCE, error)) + if (fillSource && sml_data_sync_change_item_get_location(item)) { + if (!smlLocationAssemble(sml_data_sync_change_item_get_location(item), assm, SML_ELEMENT_SOURCE, error)) goto error; } /* SourceParent */ - if (fillSource && sml_change_item_get_location(item) && - sml_location_get_parent_uri(sml_change_item_get_location(item))) { - if (!smlLocationAssemble(sml_change_item_get_location(item), assm, SML_ELEMENT_SOURCE_PARENT, error)) + if (fillSource && sml_data_sync_change_item_get_location(item) && + sml_location_get_parent_uri(sml_data_sync_change_item_get_location(item))) { + if (!smlLocationAssemble(sml_data_sync_change_item_get_location(item), assm, SML_ELEMENT_SOURCE_PARENT, error)) goto error; } /* TargetParent */ - if (!fillSource && sml_change_item_get_location(item) && - sml_location_get_parent_uri(sml_change_item_get_location(item))) { - if (!smlLocationAssemble(sml_change_item_get_location(item), assm, SML_ELEMENT_TARGET_PARENT, error)) + if (!fillSource && sml_data_sync_change_item_get_location(item) && + sml_location_get_parent_uri(sml_data_sync_change_item_get_location(item))) { + if (!smlLocationAssemble(sml_data_sync_change_item_get_location(item), assm, SML_ELEMENT_TARGET_PARENT, error)) goto error; } /* Data */ - if (sml_change_item_get_data(item)) { - const gchar *data = sml_change_item_get_data(item); + if (sml_data_sync_change_item_get_data(item)) { + const gchar *data = sml_data_sync_change_item_get_data(item); gsize size = strlen(data);; if (!_smlXmlAssemblerAddData(assm, SML_ELEMENT_DATA, data, size, FALSE, error)) @@ -566,7 +566,7 @@ } /* MoreData */ - if (sml_change_item_get_missing_data(item)) { + if (sml_data_sync_change_item_get_missing_data(item)) { if (!_smlXmlAssemblerAddString(assm, SML_ELEMENT_MOREDATA, "", error)) goto error; @@ -703,14 +703,14 @@ /* libsyncml only supports one item per change command */ smlAssert(g_list_length(change->private.change.items) == 1); - SmlChangeItem *item = g_list_nth_data(change->private.change.items, 0); + SmlDataSyncChangeItem *item = g_list_nth_data(change->private.change.items, 0); if (!item) { g_set_error(error, SML_ERROR, SML_ERROR_GENERIC, "One item of the item list is NULL."); goto error; } - if (!sml_change_item_get_content_type(item)) { + if (!sml_data_sync_change_item_get_content_type(item)) { g_set_error(error, SML_ERROR, SML_ERROR_GENERIC, "Missing contenttype"); goto error; @@ -720,7 +720,7 @@ if (!_smlXmlAssemblerStartNode(assm, SML_ELEMENT_META, error)) goto error; - if (!_smlXmlAssemblerAddStringNS(assm, SML_ELEMENT_TYPE, SML_NAMESPACE_METINF, sml_change_item_get_content_type(item), error)) + if (!_smlXmlAssemblerAddStringNS(assm, SML_ELEMENT_TYPE, SML_NAMESPACE_METINF, sml_data_sync_change_item_get_content_type(item), error)) goto error; /* We will add the max obj size node, if USE_LARGEOBJECTS is true or not set at all. Modified: trunk/libsyncml/parser/sml_xml_parse.c ============================================================================== --- trunk/libsyncml/parser/sml_xml_parse.c Fri Aug 7 19:57:20 2009 (r1248) +++ trunk/libsyncml/parser/sml_xml_parse.c Fri Aug 7 21:35:28 2009 (r1249) @@ -25,7 +25,7 @@ #include <libsyncml/sml_session_internals.h> #include "libsyncml/sml_error_internals.h" #include "libsyncml/data_sync_api/sml_location.h" -#include "libsyncml/data_sync_api/sml_change_item_internals.h" +#include "libsyncml/data_sync_api/sml_data_sync_change_item_internals.h" #include "sml_xml_parse_internals.h" #include <string.h> @@ -1139,15 +1139,15 @@ if (!item) goto error; - /* convert SmlItem to SmlChangeItem */ + /* convert SmlItem to SmlDataSyncChangeItem */ - SmlChangeItem *citem = sml_change_item_new(); + SmlDataSyncChangeItem *citem = sml_data_sync_change_item_new(); if (!citem) { smlItemUnref(item); - g_set_error(error, SML_ERROR, SML_ERROR_GENERIC, "Cannot create new instance of SmlChangeItem - out of memory."); + g_set_error(error, SML_ERROR, SML_ERROR_GENERIC, "Cannot create new instance of SmlDataSyncChangeItem - out of memory."); goto error; } - sml_change_item_set_action(citem, (*cmd)->private.change.type); + sml_data_sync_change_item_set_action(citem, (*cmd)->private.change.type); /* message from OMA DS client: * - ADD + source URI => automatically mapped item @@ -1159,33 +1159,33 @@ * => second check the source URI for a not yet mapped item */ if (smlItemGetTarget(item)) { - if (!sml_change_item_set_location(citem, smlItemGetTarget(item), error)) { + if (!sml_data_sync_change_item_set_location(citem, smlItemGetTarget(item), error)) { smlItemUnref(item); g_object_unref(citem); goto error; } } else { - if (!sml_change_item_set_location(citem, smlItemGetSource(item), error)) { + if (!sml_data_sync_change_item_set_location(citem, smlItemGetSource(item), error)) { smlItemUnref(item); g_object_unref(citem); goto error; } } if (smlItemGetContent(item) && - !sml_change_item_set_data(citem, smlItemGetContent(item), smlItemGetSize(item), error)) { + !sml_data_sync_change_item_set_data(citem, smlItemGetContent(item), smlItemGetSize(item), error)) { smlItemUnref(item); g_object_unref(citem); goto error; } if (smlItemGetContentType(item) && - !sml_change_item_set_content_type(citem, smlItemGetContentType(item), error)) { + !sml_data_sync_change_item_set_content_type(citem, smlItemGetContentType(item), error)) { smlItemUnref(item); g_object_unref(citem); goto error; } if (smlItemGetMoreData(item)) { - sml_change_item_set_missing_data(citem, TRUE); - sml_change_item_set_planned_size(citem, (*cmd)->size); + sml_data_sync_change_item_set_missing_data(citem, TRUE); + sml_data_sync_change_item_set_planned_size(citem, (*cmd)->size); } if (!source && smlItemGetSource(item)) { source = smlItemGetSource(item); @@ -1231,10 +1231,10 @@ guint i; for (i=0; i < g_list_length((*cmd)->private.change.items); i++) { - SmlChangeItem *item = g_list_nth_data((*cmd)->private.change.items, i); - if (sml_change_item_get_content_type(item) == NULL && + SmlDataSyncChangeItem *item = g_list_nth_data((*cmd)->private.change.items, i); + if (sml_data_sync_change_item_get_content_type(item) == NULL && contenttype && - !sml_change_item_set_content_type(item, contenttype, error)) { + !sml_data_sync_change_item_set_content_type(item, contenttype, error)) { goto error; } } Modified: trunk/libsyncml/sml_command.c ============================================================================== --- trunk/libsyncml/sml_command.c Fri Aug 7 19:57:20 2009 (r1248) +++ trunk/libsyncml/sml_command.c Fri Aug 7 21:35:28 2009 (r1249) @@ -25,7 +25,7 @@ #include "sml_support.h" #include "parser/sml_xml_assm.h" -#include <libsyncml/data_sync_api/sml_change_item_internals.h> +#include <libsyncml/data_sync_api/sml_data_sync_change_item_internals.h> SmlCommandType smlCommandTypeFromString (const gchar *name, @@ -414,7 +414,7 @@ guint i; for (i = 0; i < g_list_length(cmd->private.change.items); i++) { - SmlChangeItem *item = g_list_nth_data(cmd->private.change.items, i); + SmlDataSyncChangeItem *item = g_list_nth_data(cmd->private.change.items, i); g_object_unref(item); } g_list_free(cmd->private.change.items); @@ -446,14 +446,14 @@ } SmlCommand* -smlCommandNewChange (SmlChangeItem *item, +smlCommandNewChange (SmlDataSyncChangeItem *item, GError **error) { smlTrace(TRACE_ENTRY, "%s(%p, %p)", __func__, item, error); CHECK_ERROR_REF SmlCommand *cmd = NULL; - switch (sml_change_item_get_action(item)) { + switch (sml_data_sync_change_item_get_action(item)) { case SML_CHANGE_ADD: cmd = smlCommandNew(SML_COMMAND_TYPE_ADD, error); break; @@ -1018,7 +1018,7 @@ return g_list_length(cmd->private.change.items); } -SmlChangeItem* +SmlDataSyncChangeItem* smlCommandGetNthChange (SmlCommand *cmd, gsize n) { @@ -1049,10 +1049,10 @@ { smlAssert(cmd); - SmlChangeItem *item = g_list_nth_data(cmd->private.change.items, n); - if (!sml_change_item_get_data(item)) + SmlDataSyncChangeItem *item = g_list_nth_data(cmd->private.change.items, n); + if (!sml_data_sync_change_item_get_data(item)) return 0; - return strlen(sml_change_item_get_data(item)); + return strlen(sml_data_sync_change_item_get_data(item)); } SmlCommand* @@ -1063,14 +1063,14 @@ { smlAssert(orig_cmd); - SmlChangeItem *frag_item = NULL; + SmlDataSyncChangeItem *frag_item = NULL; SmlCommand *frag_cmd = NULL; - SmlChangeItem *orig_item = g_list_nth_data(orig_cmd->private.change.items, 0); + SmlDataSyncChangeItem *orig_item = g_list_nth_data(orig_cmd->private.change.items, 0); /* create item fragment */ - frag_item = sml_change_item_get_fragment(orig_item, start, space, error); + frag_item = sml_data_sync_change_item_get_fragment(orig_item, start, space, error); if (!frag_item) goto error; @@ -1092,7 +1092,7 @@ * command. */ if (start == 0) - frag_cmd->size = strlen(sml_change_item_get_data(orig_item)); + frag_cmd->size = strlen(sml_data_sync_change_item_get_data(orig_item)); return frag_cmd; error: @@ -1119,7 +1119,7 @@ smlAssert(target); while(1) { - SmlChangeItem *item = g_list_nth_data(source->private.change.items, start); + SmlDataSyncChangeItem *item = g_list_nth_data(sour... [truncated message content] |
