Menu
▾
▴
[Opensync-commits] r1263 - in trunk: libsyncml libsyncml/data_sync_api libsyncml/transports tests tests/mobiles
|
From: <svn...@op...> - 2009-09-14 09:24:46
|
Author: bellmich Date: Mon Sep 14 11:24:28 2009 New Revision: 1263 URL: http://libsyncml.opensync.org/changeset/1263 Log: fixed several compiler warnings Modified: trunk/libsyncml/data_sync_api/sml_data_sync.c trunk/libsyncml/data_sync_api/sml_data_sync.h trunk/libsyncml/data_sync_api/sml_data_sync_data_store.c trunk/libsyncml/data_sync_api/sml_data_sync_data_store_session.c trunk/libsyncml/data_sync_api/sml_data_sync_session.c trunk/libsyncml/sml_session.c trunk/libsyncml/sml_transport.c trunk/libsyncml/transports/obex_server.c trunk/tests/check_data_sync_api.c trunk/tests/check_devinf.c trunk/tests/check_ds.c trunk/tests/check_http.c trunk/tests/check_manager.c trunk/tests/check_obex.c trunk/tests/check_session.c trunk/tests/check_sync.c trunk/tests/mobiles/obex_mobile_ds_client.c trunk/tests/support.c trunk/tests/support.h Modified: trunk/libsyncml/data_sync_api/sml_data_sync.c ============================================================================== --- trunk/libsyncml/data_sync_api/sml_data_sync.c Sat Sep 12 16:48:23 2009 (r1262) +++ trunk/libsyncml/data_sync_api/sml_data_sync.c Mon Sep 14 11:24:28 2009 (r1263) @@ -296,7 +296,7 @@ SmlTransportType type, GError **error) { - g_return_if_fail (SML_IS_DATA_SYNC (self)); + sml_return_val_error_if_fail (SML_IS_DATA_SYNC (self), FALSE, error, SML_ERROR_GENERIC, "There must be a SmlDataSync object."); self->priv->tsp_type = type; self->priv->tsp = smlTransportNew(self->priv->tsp_type, error); @@ -357,7 +357,7 @@ SmlSessionType type, GError **error) { - g_return_if_fail (SML_IS_DATA_SYNC (self)); + sml_return_val_error_if_fail (SML_IS_DATA_SYNC (self), FALSE, error, SML_ERROR_GENERIC, "There must be a SmlDataSync object."); self->priv->session_type = type; switch(self->priv->session_type) @@ -529,15 +529,17 @@ * @ds: A #SmlDataSyncDataStore * */ -void +gboolean sml_data_sync_add_data_store (SmlDataSync *self, - SmlDataSyncDataStore *ds) + SmlDataSyncDataStore *ds, + GError **error) { - g_return_if_fail (SML_IS_DATA_SYNC (self)); - g_return_if_fail (SML_IS_DATA_SYNC_DATA_STORE (ds)); + sml_return_val_error_if_fail (SML_IS_DATA_SYNC (self), FALSE, error, SML_ERROR_GENERIC, "There must be a SmlDataSync object."); + sml_return_val_error_if_fail (SML_IS_DATA_SYNC_DATA_STORE (ds), FALSE, error, SML_ERROR_GENERIC, "There must be a SmlDataSyncDataStore object."); self->priv->data_stores = g_list_append(self->priv->data_stores, ds); sml_data_sync_data_store_set_data_sync(ds, self); + return TRUE; } /** @@ -811,7 +813,6 @@ smlTrace(TRACE_ENTRY, "%s(%p, %i, %p, %p, %p)", __func__, manager, type, session, error, userdata); SmlDataSync *self = userdata; smlAssert(self); - GList *o = NULL; GError *locerror = NULL; /* FIXME: Is this lock really needed? */ /* FIXME: Who is allowed to call smlManagerDispatch? */ @@ -834,7 +835,7 @@ case SML_MANAGER_SESSION_ERROR: case SML_MANAGER_SESSION_WARNING: smlTrace(TRACE_INTERNAL, "%s: forwarding session %p event %d", __func__, data_sync_session, type); - sml_data_sync_session_event_callback(data_sync_session, type, error); + sml_data_sync_session_send_event(data_sync_session, NULL, type, error); break; case SML_MANAGER_CONNECT_DONE: smlTrace(TRACE_INTERNAL, "%s: the transport was connected", __func__); @@ -864,7 +865,6 @@ self->priv->state < SML_DATA_SYNC_STATE_DISCONNECTED) { if (self->priv->state < SML_DATA_SYNC_STATE_DISCONNECT_IN_PROGRESS) { self->priv->state = SML_DATA_SYNC_STATE_DISCONNECT_IN_PROGRESS; - GError *locerror = NULL; g_hash_table_foreach (self->priv->data_sync_sessions, sml_data_sync_disconnect_session, self); } else { /* disconnect failed */ Modified: trunk/libsyncml/data_sync_api/sml_data_sync.h ============================================================================== --- trunk/libsyncml/data_sync_api/sml_data_sync.h Sat Sep 12 16:48:23 2009 (r1262) +++ trunk/libsyncml/data_sync_api/sml_data_sync.h Mon Sep 14 11:24:28 2009 (r1263) @@ -64,6 +64,7 @@ }; #include "sml_data_sync_session.h" +#include "sml_data_sync_data_store.h" GType sml_data_sync_get_type (void); SmlDataSync* sml_data_sync_new (void); @@ -74,6 +75,7 @@ gboolean sml_data_sync_set_option (SmlDataSync *self, const gchar *name, const gchar *value, GError **error); gboolean sml_data_sync_initialize (SmlDataSync *self, GError **error); gboolean sml_data_sync_run (SmlDataSync *self, GError **error); +gboolean sml_data_sync_add_data_store (SmlDataSync *self, SmlDataSyncDataStore *ds, GError **error); typedef void (* SmlDataSyncSessionEventCallback) (SmlDataSyncSession *self, SmlDataSync *data_sync, SmlDataSyncEventType type, void *userdata, const GError *error); typedef gboolean (* SmlDataSyncSessionWriteDevInfCallback) (SmlDataSyncSession *self, SmlDevInf *devinf, void *userdata, GError **error); Modified: trunk/libsyncml/data_sync_api/sml_data_sync_data_store.c ============================================================================== --- trunk/libsyncml/data_sync_api/sml_data_sync_data_store.c Sat Sep 12 16:48:23 2009 (r1262) +++ trunk/libsyncml/data_sync_api/sml_data_sync_data_store.c Mon Sep 14 11:24:28 2009 (r1263) @@ -351,7 +351,7 @@ G_CONST_RETURN gchar* sml_data_sync_data_store_get_local_uri (SmlDataSyncDataStore *self) { - g_return_if_fail (SML_IS_DATA_SYNC_DATA_STORE (self)); + g_return_val_if_fail (SML_IS_DATA_SYNC_DATA_STORE (self), NULL); if (!self->priv->local) return NULL; return sml_location_get_uri(self->priv->local); Modified: trunk/libsyncml/data_sync_api/sml_data_sync_data_store_session.c ============================================================================== --- trunk/libsyncml/data_sync_api/sml_data_sync_data_store_session.c Sat Sep 12 16:48:23 2009 (r1262) +++ trunk/libsyncml/data_sync_api/sml_data_sync_data_store_session.c Mon Sep 14 11:24:28 2009 (r1263) @@ -30,6 +30,7 @@ #include "sml_data_sync_defines.h" #include "sml_data_sync_internals.h" #include "sml_data_sync_session_internals.h" +#include "data_sync_devinf.h" G_DEFINE_TYPE (SmlDataSyncDataStoreSession, sml_data_sync_data_store_session, G_TYPE_OBJECT) Modified: trunk/libsyncml/data_sync_api/sml_data_sync_session.c ============================================================================== --- trunk/libsyncml/data_sync_api/sml_data_sync_session.c Sat Sep 12 16:48:23 2009 (r1262) +++ trunk/libsyncml/data_sync_api/sml_data_sync_session.c Mon Sep 14 11:24:28 2009 (r1263) @@ -20,6 +20,9 @@ #include "sml_data_sync_session_private.h" #include "sml_data_sync_data_store_session_internals.h" +#include "data_sync_devinf.h" + +/* FIXME: !!!!!!! */ #include "sml_data_sync_private.h" #include "sml_data_sync_internals.h" Modified: trunk/libsyncml/sml_session.c ============================================================================== --- trunk/libsyncml/sml_session.c Sat Sep 12 16:48:23 2009 (r1262) +++ trunk/libsyncml/sml_session.c Mon Sep 14 11:24:28 2009 (r1263) @@ -34,6 +34,8 @@ #include "data_sync_api/sml_location.h" #include "data_sync_api/sml_data_sync_change_item_internals.h" +#include <unistd.h> + /** * @defgroup SmlSessionPrivate SyncML Session Private API * @ingroup PrivateLowLevelAPI Modified: trunk/libsyncml/sml_transport.c ============================================================================== --- trunk/libsyncml/sml_transport.c Sat Sep 12 16:48:23 2009 (r1262) +++ trunk/libsyncml/sml_transport.c Mon Sep 14 11:24:28 2009 (r1263) @@ -25,6 +25,7 @@ #include "sml_support.h" #include <config.h> +#include <unistd.h> #ifdef ENABLE_HTTP #include "transports/http_client_internals.h" @@ -812,6 +813,9 @@ g_set_error(error, SML_ERROR, SML_ERROR_GENERIC, "OBEX Transport not enabled in this build"); goto error; #endif + case SML_TRANSPORT_UNKNOWN: + g_set_error(error, SML_ERROR, SML_ERROR_GENERIC, "The transport type must be specified."); + goto error; } tsp->command_queue = smlQueueNew(error); Modified: trunk/libsyncml/transports/obex_server.c ============================================================================== --- trunk/libsyncml/transports/obex_server.c Sat Sep 12 16:48:23 2009 (r1262) +++ trunk/libsyncml/transports/obex_server.c Mon Sep 14 11:24:28 2009 (r1263) @@ -31,6 +31,7 @@ #include <errno.h> #include <string.h> +#include <unistd.h> #ifndef WIN32 #include <fcntl.h> Modified: trunk/tests/check_data_sync_api.c ============================================================================== --- trunk/tests/check_data_sync_api.c Sat Sep 12 16:48:23 2009 (r1262) +++ trunk/tests/check_data_sync_api.c Mon Sep 14 11:24:28 2009 (r1263) @@ -26,6 +26,7 @@ #include <libsyncml/data_sync_api/sml_data_sync.h> #include <string.h> +#include <unistd.h> GMutex *runMutex = NULL; int locks; @@ -63,7 +64,6 @@ for (;list;list = list->next) { count++; - const char *test_data = list->data; char *name = g_strdup_printf("%d", count); SmlLocation *loc = sml_location_new(); sml_location_set_uri(loc, name); @@ -371,9 +371,9 @@ goto error; /* The OBEX server needs some time to start. */ if (g_getenv("SYNCML_TRACE")) - sleep(2); + usleep(2000); else - sleep(5); + usleep(5000); if (!sml_data_sync_run(server, &error)) goto error; } Modified: trunk/tests/check_devinf.c ============================================================================== --- trunk/tests/check_devinf.c Sat Sep 12 16:48:23 2009 (r1262) +++ trunk/tests/check_devinf.c Mon Sep 14 11:24:28 2009 (r1263) @@ -27,6 +27,7 @@ #include "libsyncml/parser/sml_xml_parse.h" #include <string.h> +#include <unistd.h> #define NUM_SESSIONS 30 Modified: trunk/tests/check_ds.c ============================================================================== --- trunk/tests/check_ds.c Sat Sep 12 16:48:23 2009 (r1262) +++ trunk/tests/check_ds.c Mon Sep 14 11:24:28 2009 (r1263) @@ -31,6 +31,7 @@ #include <libsyncml/data_sync_api/sml_location.h> #include <string.h> +#include <unistd.h> typedef struct SmlSessionThread { GMainContext *context; Modified: trunk/tests/check_http.c ============================================================================== --- trunk/tests/check_http.c Sat Sep 12 16:48:23 2009 (r1262) +++ trunk/tests/check_http.c Mon Sep 14 11:24:28 2009 (r1263) @@ -24,6 +24,8 @@ #include <libsyncml/sml_transport_internals.h> #include <libsyncml/sml_error_internals.h> +#include <unistd.h> + int client_connects; int client_disconnects; int client_receives; Modified: trunk/tests/check_manager.c ============================================================================== --- trunk/tests/check_manager.c Sat Sep 12 16:48:23 2009 (r1262) +++ trunk/tests/check_manager.c Mon Sep 14 11:24:28 2009 (r1263) @@ -25,6 +25,8 @@ #include <libsyncml/data_sync_api/sml_location.h> #include <libsyncml/sml_error_internals.h> +#include <unistd.h> + #define NUM_SESSIONS 30 unsigned int defaultMaxMsgSize = 10240; Modified: trunk/tests/check_obex.c ============================================================================== --- trunk/tests/check_obex.c Sat Sep 12 16:48:23 2009 (r1262) +++ trunk/tests/check_obex.c Mon Sep 14 11:24:28 2009 (r1263) @@ -26,6 +26,7 @@ #include <libsyncml/sml_error_internals.h> #include <errno.h> +#include <unistd.h> START_TEST (obex_get_result_macro) { @@ -725,7 +726,7 @@ sml_fail_unless(smlTransportConnect(client, &error), NULL); sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); - sleep(1); + // usleep(50); while (client_errors < 1) { usleep(50); }; Modified: trunk/tests/check_session.c ============================================================================== --- trunk/tests/check_session.c Sat Sep 12 16:48:23 2009 (r1262) +++ trunk/tests/check_session.c Mon Sep 14 11:24:28 2009 (r1263) @@ -30,6 +30,8 @@ #include <libsyncml/sml_notification.h> +#include <unistd.h> + typedef struct SmlSessionThread { GMainContext *context; GSourceFuncs *functions; Modified: trunk/tests/check_sync.c ============================================================================== --- trunk/tests/check_sync.c Sat Sep 12 16:48:23 2009 (r1262) +++ trunk/tests/check_sync.c Mon Sep 14 11:24:28 2009 (r1263) @@ -31,6 +31,7 @@ #include <libsyncml/sml_error_internals.h> #include <config.h> +#include <unistd.h> #define NUM_SESSIONS 30 Modified: trunk/tests/mobiles/obex_mobile_ds_client.c ============================================================================== --- trunk/tests/mobiles/obex_mobile_ds_client.c Sat Sep 12 16:48:23 2009 (r1262) +++ trunk/tests/mobiles/obex_mobile_ds_client.c Mon Sep 14 11:24:28 2009 (r1263) @@ -29,6 +29,7 @@ #include <libsyncml/sml_transport_internals.h> #include <wbxml.h> +#include <unistd.h> /* external configuration */ Modified: trunk/tests/support.c ============================================================================== --- trunk/tests/support.c Sat Sep 12 16:48:23 2009 (r1262) +++ trunk/tests/support.c Mon Sep 14 11:24:28 2009 (r1263) @@ -21,6 +21,7 @@ #include "support.h" #include <libsyncml/sml_error_internals.h> #include <libxml/parser.h> +#include <unistd.h> #ifndef THREAD_SAFE_CHECK GStaticMutex __libsyncml_check_mutex = G_STATIC_MUTEX_INIT; Modified: trunk/tests/support.h ============================================================================== --- trunk/tests/support.h Sat Sep 12 16:48:23 2009 (r1262) +++ trunk/tests/support.h Mon Sep 14 11:24:28 2009 (r1263) @@ -26,6 +26,7 @@ #include <check.h> #include <libsyncml/sml_support.h> #include <libsyncml/sml_parse.h> +#include <libsyncml/data_sync_api/sml_data_sync_change_item_internals.h> void configure_environment(); void cleanup_environment(); |
