Menu
▾
▴
[Opensync-commits] r5729 - plugins/syncml/src
|
From: <svn...@op...> - 2009-09-02 17:56:13
|
Author: dgollub Date: Wed Sep 2 19:55:58 2009 New Revision: 5729 URL: http://www.opensync.org/changeset/5729 Log: Reverted libsyncml-trunk port. libsyncml-trunk is too experimental Modified: plugins/syncml/src/syncml_callbacks.c plugins/syncml/src/syncml_callbacks.h plugins/syncml/src/syncml_common.c plugins/syncml/src/syncml_common.h plugins/syncml/src/syncml_devinf.c plugins/syncml/src/syncml_devinf.h plugins/syncml/src/syncml_ds_client.c plugins/syncml/src/syncml_ds_client.h plugins/syncml/src/syncml_ds_server.c plugins/syncml/src/syncml_ds_server.h plugins/syncml/src/syncml_obex_client.c plugins/syncml/src/syncml_vformat.c plugins/syncml/src/syncml_vformat.h Modified: plugins/syncml/src/syncml_callbacks.c ============================================================================== --- plugins/syncml/src/syncml_callbacks.c Wed Sep 2 19:13:52 2009 (r5728) +++ plugins/syncml/src/syncml_callbacks.c Wed Sep 2 19:55:58 2009 (r5729) @@ -34,10 +34,10 @@ SmlDataSyncObject *dsObject, SmlDataSyncEventType type, void *userdata, - const GError *error) + SmlError *error) { osync_trace(TRACE_ENTRY, "%s(%p, %i, %p, %p)", __func__, dsObject, type, userdata, error); - GError *locerror = NULL; + SmlError *locerror = NULL; SmlPluginEnv *env = userdata; GList *o = NULL; @@ -50,10 +50,8 @@ switch (type) { case SML_DATA_SYNC_EVENT_ERROR: env->abort =TRUE; - // TODO: check for correct porting, and if there is a leak due to the missing deref? - //smlErrorDuplicate(&locerror, &error); - //smlErrorDeref(&error); - locerror = g_error_copy(error); + smlErrorDuplicate(&locerror, &error); + smlErrorDeref(&error); goto error; break; case SML_DATA_SYNC_EVENT_CONNECT: @@ -126,7 +124,7 @@ error: osync_trace(TRACE_INTERNAL, "%s: Cleaning up because of an error ...", __func__); OSyncError *oserror = NULL; - osync_error_set(&oserror, OSYNC_ERROR_GENERIC, locerror->message); + osync_error_set(&oserror, OSYNC_ERROR_GENERIC, smlErrorPrint(&locerror)); if (env->disconnectCtx) report_error_on_context(&(env->disconnectCtx), &oserror, FALSE); @@ -178,7 +176,7 @@ const char *source, SmlAlertType recvType, void *userdata, - GError **error) + SmlError **error) { osync_trace(TRACE_ENTRY, "%s: %s => %d", __func__, source, recvType); @@ -220,7 +218,7 @@ /* if there is a disconnect context then this is an abort */ if (database->env->disconnectCtx) { - g_set_error(error, PLUGIN_ERROR, SML_ERROR_GENERIC, + smlErrorSet(error, SML_ERROR_GENERIC, "A disconnect is enforced while waiting for connect_done."); goto error; } @@ -235,7 +233,7 @@ if (recvType == SML_ALERT_SLOW_SYNC && recvType != sentType) { - g_set_error(error, PLUGIN_ERROR, SML_ERROR_GENERIC, + smlErrorSet(error, SML_ERROR_GENERIC, "The remote peer requested a SLOW-SYNC " \ "but the local OpenSync instance enforces a normal synchronization."); goto error; @@ -244,7 +242,7 @@ osync_trace(TRACE_EXIT, "%s - %d", __func__, sentType); return sentType; error: - osync_trace(TRACE_EXIT_ERROR, "%s - %s", __func__, (*error)->message); + osync_trace(TRACE_EXIT_ERROR, "%s - %s", __func__, smlErrorPrint(error)); return SML_ALERT_UNKNOWN; } @@ -252,33 +250,33 @@ SmlDataSyncObject *dsObject, const char *name, void *userdata, - GError **error) + SmlError **error) { SmlPluginEnv *env = userdata; OSyncError *oerror = NULL; osync_assert(env->stateDB); char *value = osync_sink_state_get(env->stateDB, name, &oerror); if (oerror) { - g_set_error(error, PLUGIN_ERROR, SML_ERROR_GENERIC, "%s", osync_error_print(&oerror)); + smlErrorSet(error, SML_ERROR_GENERIC, "%s", osync_error_print(&oerror)); osync_error_unref(&oerror); value = NULL; } return value; } -gboolean _set_anchor( +SmlBool _set_anchor( SmlDataSyncObject *dsObject, const char *name, const char *value, void *userdata, - GError **error) + SmlError **error) { SmlPluginEnv *env = userdata; OSyncError *oerror = NULL; osync_assert(env->stateDB); - gboolean result = osync_sink_state_set(env->stateDB, name, value, &oerror); + SmlBool result = osync_sink_state_set(env->stateDB, name, value, &oerror); if (oerror) { - g_set_error(error, PLUGIN_ERROR, SML_ERROR_GENERIC, "%s", osync_error_print(&oerror)); + smlErrorSet(error, SML_ERROR_GENERIC, "%s", osync_error_print(&oerror)); osync_error_unref(&oerror); result = FALSE; } @@ -289,15 +287,15 @@ /* ***** Change Callbacks ***** */ /* ************************************ */ -gboolean _recv_change( +SmlBool _recv_change( SmlDataSyncObject *dsObject, - const gchar *source, + const char *source, SmlChangeType type, - const gchar *uid, - gchar *data, - gsize size, + const char *uid, + char *data, + unsigned int size, void *userdata, - GError **error) + SmlError **error) { osync_trace(TRACE_ENTRY, "%s(%p, %i, %s, %p, %i, %s, %p, %p)", __func__, dsObject, type, uid, data, size, source, userdata, error); SmlPluginEnv *env = userdata; @@ -313,7 +311,7 @@ change = osync_change_new(&oerror); if (!change) { - g_set_error(error, PLUGIN_ERROR, SML_ERROR_GENERIC, "No change created: %s", osync_error_print(&oerror)); + smlErrorSet(error, SML_ERROR_GENERIC, "No change created: %s", osync_error_print(&oerror)); osync_error_unref(&oerror); oerror = NULL; goto error; @@ -358,8 +356,6 @@ osync_context_report_change(database->getChangesCtx, change); -/* FIXME: Obsolate? Is this handle inside libsyncml now? */ -#if 0 // if this is a client then we should send a map item here if (env->sessionType == SML_SESSION_TYPE_CLIENT) { @@ -367,7 +363,6 @@ if (!smlDataSyncAddMapping(dsObject, source, uid, osync_change_get_uid(change), error)) goto error; } -#endif osync_change_unref(change); change = NULL; @@ -376,7 +371,7 @@ return TRUE; oerror: - g_set_error(error, PLUGIN_ERROR, SML_ERROR_GENERIC, "%s", osync_error_print(&oerror)); + smlErrorSet(error, SML_ERROR_GENERIC, "%s", osync_error_print(&oerror)); osync_error_unref(&oerror); oerror = NULL; error: @@ -385,19 +380,20 @@ osync_change_unref(change); change = NULL; } - osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, (*error)->message); + osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(error)); return FALSE; } -gboolean _recv_change_status( +SmlBool _recv_change_status( SmlDataSyncObject *dsObject, - guint code, + unsigned int code, + const char *newuid, void *userdata, - GError **error) + SmlError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %d, %p)", __func__, dsObject, code, userdata); + osync_trace(TRACE_ENTRY, "%s(%p, %d, %s, %p)", __func__, dsObject, code, newuid, userdata); struct commitContext *ctx = userdata; - gboolean result = TRUE; + SmlBool result = TRUE; if (code < 200 || 299 < code) { OSyncError *error = NULL; @@ -408,9 +404,8 @@ report_error_on_context(&(ctx->context), &error, TRUE); result = FALSE; } else { - // FIXME: uid change is now reporbted by some differen callback ... - // if (newuid) - // osync_change_set_uid(ctx->change, newuid); + if (newuid) + osync_change_set_uid(ctx->change, newuid); report_success_on_context(&(ctx->context)); } @@ -423,15 +418,15 @@ return result; } -gboolean _recv_unwanted_change( +SmlBool _recv_unwanted_change( SmlDataSyncObject *dsObject, const char *source, SmlChangeType type, - const gchar *uid, - gchar *data, - gsize size, + const char *uid, + char *data, + unsigned int size, void *userdata, - GError **error) + SmlError **error) { osync_trace(TRACE_ENTRY, "%s(%p, %i, %s, %p, %i, %s, %p, %p)", __func__, dsObject, type, uid, data, size, source, userdata, error); @@ -477,7 +472,7 @@ } else { /* This problem should be fixed with the next SLOW-SYNC. */ osync_trace(TRACE_EXIT_ERROR, "%s - unexpected Add or Replace command", __func__); - g_set_error(error, PLUGIN_ERROR, SML_ERROR_GENERIC, "Unwanted Add or Replace command on second OMA DS session."); + smlErrorSet(error, SML_ERROR_GENERIC, "Unwanted Add or Replace command on second OMA DS session."); return FALSE; } } Modified: plugins/syncml/src/syncml_callbacks.h ============================================================================== --- plugins/syncml/src/syncml_callbacks.h Wed Sep 2 19:13:52 2009 (r5728) +++ plugins/syncml/src/syncml_callbacks.h Wed Sep 2 19:55:58 2009 (r5729) @@ -31,7 +31,7 @@ SmlDataSyncObject *dsObject, SmlDataSyncEventType type, void *userdata, - const GError *error); + SmlError *error); /* *********************************** */ /* ***** Alert Callbacks ***** */ @@ -42,49 +42,50 @@ const char *source, SmlAlertType type, void *userdata, - GError **error); + SmlError **error); char *_get_anchor( SmlDataSyncObject *dsObject, const char *name, void *userdata, - GError **error); + SmlError **error); -gboolean _set_anchor( +SmlBool _set_anchor( SmlDataSyncObject *dsObject, const char *name, const char *value, void *userdata, - GError **error); + SmlError **error); /* ************************************ */ /* ***** Change Callbacks ***** */ /* ************************************ */ -gboolean _recv_change( +SmlBool _recv_change( SmlDataSyncObject *dsObject, const char *source, SmlChangeType type, - const gchar *uid, - gchar *data, - gsize size, + const char *uid, + char *data, + unsigned int size, void *userdata, - GError **error); + SmlError **error); -gboolean _recv_unwanted_change( +SmlBool _recv_unwanted_change( SmlDataSyncObject *dsObject, const char *source, SmlChangeType type, - const gchar *uid, - gchar *data, - gsize size, + const char *uid, + char *data, + unsigned int size, void *userdata, - GError **error); + SmlError **error); -gboolean _recv_change_status( +SmlBool _recv_change_status( SmlDataSyncObject *dsObject, - guint code, + unsigned int code, + const char *newuid, void *userdata, - GError **error); + SmlError **error); #endif //_SYNCML_CALLBACKS_H Modified: plugins/syncml/src/syncml_common.c ============================================================================== --- plugins/syncml/src/syncml_common.c Wed Sep 2 19:13:52 2009 (r5728) +++ plugins/syncml/src/syncml_common.c Wed Sep 2 19:55:58 2009 (r5729) @@ -223,7 +223,7 @@ SmlPluginEnv *env = (SmlPluginEnv *)data; g_assert(env); - gboolean waitForConnectDone = FALSE; + SmlBool waitForConnectDone = FALSE; if (env->databases && ((SmlDatabase *)env->databases->data)->alert_type_mutex && !((SmlDatabase *)env->databases->data)->connectCtx) { @@ -270,7 +270,7 @@ if (!env->waitForDisconnect) { /* this is an abort */ osync_trace(TRACE_INTERNAL, "%s: abort detected", __func__); - GError *error = NULL; + SmlError *error = NULL; if (env->dsObject2 && env->state2 > SML_DATA_SYNC_EVENT_CONNECT) { smlDataSyncAbort(env->dsObject2, &error); @@ -280,7 +280,7 @@ if (error != NULL) { OSyncError *oserror = NULL; - osync_error_set(&oserror, OSYNC_ERROR_GENERIC, "%s", error->message); + osync_error_set(&oserror, OSYNC_ERROR_GENERIC, "%s", smlErrorPrint(&error)); report_error_on_context(&(env->disconnectCtx), &oserror, TRUE); } } @@ -418,7 +418,7 @@ SmlDatabase *get_database_from_source( SmlPluginEnv *env, const char *source, - GError **error) + SmlError **error) { osync_trace(TRACE_ENTRY, "%s(%p, %s, %p)", __func__, env, source, error); @@ -436,7 +436,7 @@ if (o) o = o->next; } if (!database) { - g_set_error(error, PLUGIN_ERROR, SML_ERROR_GENERIC, + smlErrorSet(error, SML_ERROR_GENERIC, "Cannot found datastore %s.", source); goto error; @@ -444,7 +444,7 @@ osync_trace(TRACE_EXIT, "%s", __func__); return database; error: - osync_trace(TRACE_EXIT_ERROR, "%s -%s", __func__, (*error)->message); + osync_trace(TRACE_EXIT_ERROR, "%s -%s", __func__, smlErrorPrint(error)); return NULL; } @@ -454,7 +454,7 @@ SmlDatabase *database = (SmlDatabase *)data; SmlPluginEnv *env = database->env; - GError *error = NULL; + SmlError *error = NULL; OSyncError *oserror = NULL; /* The context is preserved in the environment. @@ -478,8 +478,8 @@ osync_trace(TRACE_EXIT, "%s", __func__); return; error: - osync_error_set(&oserror, OSYNC_ERROR_GENERIC, "%s", error->message); - g_error_free(error); + osync_error_set(&oserror, OSYNC_ERROR_GENERIC, "%s", smlErrorPrint(&error)); + smlErrorDeref(&error); osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(&oserror)); report_error_on_context(&(database->connectCtx), &oserror, TRUE); } @@ -518,7 +518,7 @@ __func__, tsp, dsObject, config, oerror); OSyncPluginConnection *conn; char *url = NULL; - GError *error = NULL; + SmlError *error = NULL; if (!smlDataSyncSetOption( dsObject, @@ -744,8 +744,8 @@ osync_trace(TRACE_EXIT, "%s - TRUE", __func__); return TRUE; error: - osync_error_set(oerror, OSYNC_ERROR_MISCONFIGURATION, "%s", error->message); - g_error_free(error); + osync_error_set(oerror, OSYNC_ERROR_MISCONFIGURATION, "%s", smlErrorPrint(&error)); + smlErrorDeref(&error); oerror: osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(oerror)); return FALSE; @@ -759,7 +759,7 @@ OSyncError **oerror) { osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, info, oerror); - GError *error = NULL; + SmlError *error = NULL; SmlPluginEnv *env = osync_try_malloc0(sizeof(SmlPluginEnv), oerror); if (!env) @@ -859,8 +859,8 @@ finalize(env); error: if (error) { - osync_error_set(oerror, OSYNC_ERROR_GENERIC, "%s", error->message); - g_error_free(error); + osync_error_set(oerror, OSYNC_ERROR_GENERIC, "%s", smlErrorPrint(&error)); + smlErrorDeref(&error); } osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(oerror)); return NULL; Modified: plugins/syncml/src/syncml_common.h ============================================================================== --- plugins/syncml/src/syncml_common.h Wed Sep 2 19:13:52 2009 (r5728) +++ plugins/syncml/src/syncml_common.h Wed Sep 2 19:55:58 2009 (r5729) @@ -42,17 +42,12 @@ #include <glib.h> -#include <libsyncml/syncml.h> -#include <libsyncml/dev_inf_api/sml_dev_inf.h> #include <libsyncml/data_sync_api/defines.h> #include <libsyncml/data_sync_api/standard.h> -#include <libsyncml/data_sync_api/callbacks.h> #include <libxml/xmlmemory.h> #include <libxml/parser.h> -#define PLUGIN_ERROR g_quark_from_static_string("syncml-plugin") - /* The default limits are taken from libsyncml. */ #define OSYNC_PLUGIN_SYNCML_MAX_MSG_SIZE SML_DEFAULT_MAX_MSG_SIZE #define OSYNC_PLUGIN_SYNCML_MAX_OBJ_SIZE SML_DEFAULT_MAX_OBJ_SIZE @@ -89,8 +84,8 @@ /* libsyncml state management */ - gboolean abort; - gboolean waitForDisconnect; + SmlBool abort; + SmlBool waitForDisconnect; SmlDataSyncEventType state1; SmlDataSyncEventType state2; @@ -188,7 +183,7 @@ SmlDatabase *get_database_from_source( SmlPluginEnv *env, const char *source, - GError **error); + SmlError **error); SmlChangeType _get_changetype(OSyncChange *change); Modified: plugins/syncml/src/syncml_devinf.c ============================================================================== --- plugins/syncml/src/syncml_devinf.c Wed Sep 2 19:13:52 2009 (r5728) +++ plugins/syncml/src/syncml_devinf.c Wed Sep 2 19:55:58 2009 (r5729) @@ -44,11 +44,11 @@ /* CACHE DATABASE */ /* ************************ */ -gboolean init_devinf_database_schema(OSyncDB *db, OSyncError **oerror) +SmlBool init_devinf_database_schema(OSyncDB *db, OSyncError **oerror) { osync_trace(TRACE_ENTRY, "%s", __func__); unsigned int db_schema_version = 1; - gboolean schema_update = FALSE; + SmlBool schema_update = FALSE; /* check if all necessary tables exist */ osync_trace(TRACE_INTERNAL, "%s - Does all tables exist?", __func__); @@ -192,14 +192,14 @@ return FALSE; } -gboolean store_devinf(SmlDevInf *devinf, const char *filename, GError **error) +SmlBool store_devinf(SmlDevInf *devinf, const char *filename, SmlError **error) { osync_trace(TRACE_ENTRY, "%s - %s", __func__, filename); g_assert(devinf); g_assert(filename); g_assert(error); OSyncError *oerror; - gboolean success = TRUE; + SmlBool success = TRUE; /* init database stuff */ OSyncDB *db = osync_db_new(&oerror); @@ -371,7 +371,7 @@ char *data_type = smlDevInfPropertyGetDataType(property); unsigned int max_occur = smlDevInfPropertyGetMaxOccur(property); unsigned int max_size = smlDevInfPropertyGetMaxSize(property); - gboolean no_truncate = smlDevInfPropertyGetNoTruncate(property); + SmlBool no_truncate = smlDevInfPropertyGetNoTruncate(property); char *display_name = smlDevInfPropertyGetDisplayName(property); char *esc_prop_name = osync_db_sql_escape(prop_name); char *esc_data_type = osync_db_sql_escape(data_type); @@ -491,7 +491,7 @@ return FALSE; } -SmlDevInf *load_devinf(const char *devid, const char *filename, GError **error) +SmlDevInf *load_devinf(const char *devid, const char *filename, SmlError **error) { osync_trace(TRACE_ENTRY, "%s - %s from %s", __func__, devid, filename); g_assert(devid); @@ -761,11 +761,11 @@ /* ***** Device Information Callbacks ***** */ /* ************************************************ */ -gboolean _write_devinf( +SmlBool _write_devinf( SmlDataSyncObject *dsObject, SmlDevInf *devinf, void *userdata, - GError **error) + SmlError **error) { SmlPluginEnv *env = userdata; return store_devinf(devinf, env->devinf_path, error); @@ -775,7 +775,7 @@ SmlDataSyncObject *dsObject, const char *devid, void *userdata, - GError **error) + SmlError **error) { SmlPluginEnv *env = userdata; return load_devinf(devid, env->devinf_path, error); Modified: plugins/syncml/src/syncml_devinf.h ============================================================================== --- plugins/syncml/src/syncml_devinf.h Wed Sep 2 19:13:52 2009 (r5728) +++ plugins/syncml/src/syncml_devinf.h Wed Sep 2 19:55:58 2009 (r5729) @@ -12,16 +12,16 @@ /* ***** Device Information Callbacks ***** */ /* ************************************************ */ -gboolean _write_devinf( +SmlBool _write_devinf( SmlDataSyncObject *dsObject, SmlDevInf *devinf, void *userdata, - GError **error); + SmlError **error); SmlDevInf *_read_devinf( SmlDataSyncObject *dsObject, const char *devid, void *userdata, - GError **error); + SmlError **error); #endif //_SYNCML_DEVINF_H Modified: plugins/syncml/src/syncml_ds_client.c ============================================================================== --- plugins/syncml/src/syncml_ds_client.c Wed Sep 2 19:13:52 2009 (r5728) +++ plugins/syncml/src/syncml_ds_client.c Wed Sep 2 19:55:58 2009 (r5729) @@ -23,12 +23,12 @@ #include "syncml_devinf.h" #include <libsyncml/data_sync_api/callbacks.h> -gboolean ds_client_init_databases(SmlPluginEnv *env, OSyncPluginInfo *info, OSyncError **oerror) +SmlBool ds_client_init_databases(SmlPluginEnv *env, OSyncPluginInfo *info, OSyncError **oerror) { osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, env, info, oerror); SmlDatabase *database = NULL; - GError *error = NULL; + SmlError *error = NULL; OSyncPluginConfig *config = osync_plugin_info_get_config(info); OSyncFormatEnv *formatenv = osync_plugin_info_get_format_env(info); OSyncList *l, *list = osync_plugin_info_get_objtype_sinks(info); @@ -94,8 +94,8 @@ osync_trace(TRACE_EXIT, "%s - TRUE", __func__); return TRUE; error: - osync_error_set(oerror, OSYNC_ERROR_GENERIC, "%s", error->message); - g_error_free(error); + osync_error_set(oerror, OSYNC_ERROR_GENERIC, "%s", smlErrorPrint(&error)); + smlErrorDeref(&error); oerror: if (list) osync_list_free(list); @@ -132,7 +132,7 @@ osync_trace(TRACE_ENTRY, "%s", __func__); g_assert(ctx); - GError *error = NULL; + SmlError *error = NULL; OSyncError *oserror = NULL; SmlDatabase *database = (SmlDatabase*)data; @@ -169,8 +169,8 @@ return; error: - osync_error_set(&oserror, OSYNC_ERROR_GENERIC, "%s", error->message); - g_error_free(error); + osync_error_set(&oserror, OSYNC_ERROR_GENERIC, "%s", smlErrorPrint(&error)); + smlErrorDeref(&error); oserror: if (tracer) { osync_change_unref(change); @@ -186,7 +186,7 @@ osync_trace(TRACE_ENTRY, "%s", __func__); g_assert(ctx); - GError *error = NULL; + SmlError *error = NULL; OSyncError *oserror = NULL; SmlDatabase *database = (SmlDatabase*)data; @@ -229,8 +229,8 @@ return; error: - osync_error_set(&oserror, OSYNC_ERROR_GENERIC, "%s", error->message); - g_error_free(error); + osync_error_set(&oserror, OSYNC_ERROR_GENERIC, "%s", smlErrorPrint(&error)); + smlErrorDeref(&error); /* oserror: */ osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(&oserror)); report_error_on_context(&(database->commitCtx), &oserror, TRUE); Modified: plugins/syncml/src/syncml_ds_client.h ============================================================================== --- plugins/syncml/src/syncml_ds_client.h Wed Sep 2 19:13:52 2009 (r5728) +++ plugins/syncml/src/syncml_ds_client.h Wed Sep 2 19:55:58 2009 (r5729) @@ -23,7 +23,7 @@ OSyncContext *ctx, void *data); -gboolean ds_client_init_databases( +SmlBool ds_client_init_databases( SmlPluginEnv *env, OSyncPluginInfo *info, OSyncError **oerror); Modified: plugins/syncml/src/syncml_ds_server.c ============================================================================== --- plugins/syncml/src/syncml_ds_server.c Wed Sep 2 19:13:52 2009 (r5728) +++ plugins/syncml/src/syncml_ds_server.c Wed Sep 2 19:55:58 2009 (r5729) @@ -23,11 +23,11 @@ #include "syncml_devinf.h" #include <libsyncml/data_sync_api/callbacks.h> -gboolean ds_server_init_databases(SmlPluginEnv *env, OSyncPluginInfo *info, OSyncError **oerror) +SmlBool ds_server_init_databases(SmlPluginEnv *env, OSyncPluginInfo *info, OSyncError **oerror) { osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, env, info, oerror); SmlDatabase *database = NULL; - GError *error = NULL; + SmlError *error = NULL; OSyncPluginConfig *config = osync_plugin_info_get_config(info); OSyncFormatEnv *formatenv = osync_plugin_info_get_format_env(info); OSyncList *l, *list = osync_plugin_info_get_objtype_sinks(info); @@ -91,8 +91,8 @@ osync_trace(TRACE_EXIT, "%s - TRUE", __func__); return TRUE; error: - osync_error_set(oerror, OSYNC_ERROR_GENERIC, "%s", error->message); - g_error_free(error); + osync_error_set(oerror, OSYNC_ERROR_GENERIC, "%s", smlErrorPrint(&error)); + smlErrorDeref(&error); oerror: if (list) osync_list_free(list); @@ -124,7 +124,7 @@ osync_trace(TRACE_ENTRY, "%s", __func__); g_assert(ctx); - GError *error = NULL; + SmlError *error = NULL; OSyncError *oserror = NULL; SmlDatabase *database = (SmlDatabase*)data; @@ -163,8 +163,8 @@ return; error: - osync_error_set(&oserror, OSYNC_ERROR_GENERIC, "%s", error->message); - g_error_free(error); + osync_error_set(&oserror, OSYNC_ERROR_GENERIC, "%s", smlErrorPrint(&error)); + smlErrorDeref(&error); oserror: if (tracer) { osync_change_unref(change); @@ -180,7 +180,7 @@ osync_trace(TRACE_ENTRY, "%s", __func__); g_assert(ctx); - GError *error = NULL; + SmlError *error = NULL; OSyncError *oserror = NULL; SmlDatabase *database = (SmlDatabase*)data; @@ -199,8 +199,8 @@ return; error: - osync_error_set(&oserror, OSYNC_ERROR_GENERIC, "%s", error->message); - g_error_free(error); + osync_error_set(&oserror, OSYNC_ERROR_GENERIC, "%s", smlErrorPrint(&error)); + smlErrorDeref(&error); osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(&oserror)); report_error_on_context(&(database->commitCtx), &oserror, TRUE); } Modified: plugins/syncml/src/syncml_ds_server.h ============================================================================== --- plugins/syncml/src/syncml_ds_server.h Wed Sep 2 19:13:52 2009 (r5728) +++ plugins/syncml/src/syncml_ds_server.h Wed Sep 2 19:55:58 2009 (r5729) @@ -23,7 +23,7 @@ OSyncContext *ctx, void *data); -gboolean ds_server_init_databases( +SmlBool ds_server_init_databases( SmlPluginEnv *env, OSyncPluginInfo *info, OSyncError **error); Modified: plugins/syncml/src/syncml_obex_client.c ============================================================================== --- plugins/syncml/src/syncml_obex_client.c Wed Sep 2 19:13:52 2009 (r5728) +++ plugins/syncml/src/syncml_obex_client.c Wed Sep 2 19:55:58 2009 (r5729) @@ -24,7 +24,7 @@ { osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, info, oerror); - GError *error = NULL; + SmlError *error = NULL; SmlPluginEnv *env = syncml_init( SML_SESSION_TYPE_SERVER, SML_TRANSPORT_OBEX_CLIENT, @@ -52,8 +52,8 @@ finalize(env); error: if (error) { - osync_error_set(oerror, OSYNC_ERROR_GENERIC, "%s", error->message); - g_error_free(error); + osync_error_set(oerror, OSYNC_ERROR_GENERIC, "%s", smlErrorPrint(&error)); + smlErrorDeref(&error); } osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(oerror)); return NULL; Modified: plugins/syncml/src/syncml_vformat.c ============================================================================== --- plugins/syncml/src/syncml_vformat.c Wed Sep 2 19:13:52 2009 (r5728) +++ plugins/syncml/src/syncml_vformat.c Wed Sep 2 19:55:58 2009 (r5729) @@ -2,8 +2,6 @@ #include "syncml_vformat.h" #include "syncml_common.h" -/* TODO: This will be obsoalte soooooon ...*/ -#if 0 static GHashTable* get_vcard_hash() { osync_trace(TRACE_ENTRY, "%s", __func__); @@ -77,25 +75,22 @@ osync_trace(TRACE_EXIT, "%s", __func__); return hash; } -#endif -gboolean _handle_remote_devinf( +SmlBool _handle_remote_devinf( SmlDataSyncObject *dsObject, SmlDevInf *devinf, void *userdata, - GError **error) + SmlError **error) { osync_trace(TRACE_ENTRY, "%s", __func__); SmlPluginEnv *env = userdata; - //OSyncError *oerror; + OSyncError *oerror; /*check the requirements */ g_assert(devinf); g_assert(env->pluginInfo); osync_trace(TRACE_INTERNAL, "%s: assertions ok", __func__); -/* TODO: port to new capabilities interface */ -#if 0 /* create fresh capabilties */ OSyncCapabilities *caps = osync_capabilities_new(&oerror); if (!caps) @@ -105,10 +100,7 @@ osync_trace(TRACE_EXIT_ERROR, "%s - cannot instantiate capabilties", __func__); return FALSE; } -#endif -/* TODO: smlDevInf Porting */ -#if 0 /* now manage all content type capabilities */ unsigned int capCount = smlDevInfNumCTCaps(devinf); unsigned int i; @@ -160,9 +152,6 @@ /* Good news - OpenSync knows the field. */ if (strlen(value)) { - -/* TODO: port to new capabilities interface */ -#if 0 OSyncCapability *cap = osync_capability_new(caps, objtype, g_strdup(value), &oerror); if (!cap) { @@ -172,7 +161,6 @@ safe_cfree(&name); return FALSE; } -#endif } else { /* This can happen for special fields like BEGIN, VERSION or END. * There is nothing to do here. @@ -188,12 +176,6 @@ safe_cfree(&cttype); } -#endif -/* EOF TODO: smlDevInf Porting */ - -/* TODO: port to new capabilities interface */ -#if 0 - /* add fresh capabilities to plugin info */ if (capCount) { @@ -203,7 +185,6 @@ osync_trace(TRACE_INTERNAL, "%s: no capabilities were received from the remote peer", __func__); osync_capabilities_unref(caps); } -#endif osync_trace(TRACE_EXIT, "%s - success", __func__); return TRUE; Modified: plugins/syncml/src/syncml_vformat.h ============================================================================== --- plugins/syncml/src/syncml_vformat.h Wed Sep 2 19:13:52 2009 (r5728) +++ plugins/syncml/src/syncml_vformat.h Wed Sep 2 19:55:58 2009 (r5729) @@ -4,10 +4,10 @@ #include"syncml_common.h" -gboolean _handle_remote_devinf( +SmlBool _handle_remote_devinf( SmlDataSyncObject *dsObject, SmlDevInf *devinf, void *userdata, - GError **error); + SmlError **error); #endif // SYNCML_VFORMAT_H |
