[Opensync-commits] r1201 - in trunk: libsyncml libsyncml/objects tools

[<svn...@op...>]

Author: bellmich
Date: Mon Jul 13 15:52:27 2009
New Revision: 1201
URL: http://libsyncml.opensync.org/changeset/1201

Log:
dropped SmlError and SmlBool finally

Modified:
   trunk/libsyncml/objects/sml_ds_server_internals.h
   trunk/libsyncml/sml_queue.c
   trunk/libsyncml/sml_transport.c
   trunk/libsyncml/syncml.h
   trunk/tools/syncml-obex-client.c

Modified: trunk/libsyncml/objects/sml_ds_server_internals.h
==============================================================================
--- trunk/libsyncml/objects/sml_ds_server_internals.h	Mon Jul 13 15:48:19 2009	(r1200)
+++ trunk/libsyncml/objects/sml_ds_server_internals.h	Mon Jul 13 15:52:27 2009	(r1201)
@@ -72,8 +72,8 @@
 	GList *recvSync;
 	GList *recvChanges;
 	SmlErrorType syncReply;
-	SmlBool finalLock;
-	SmlBool emptySync;
+	gboolean finalLock;
+	gboolean emptySync;
 	
 	/** Callback that will receive the reply to the sync command */
 	SmlStatusReplyCb sentSyncCallback;

Modified: trunk/libsyncml/sml_queue.c
==============================================================================
--- trunk/libsyncml/sml_queue.c	Mon Jul 13 15:48:19 2009	(r1200)
+++ trunk/libsyncml/sml_queue.c	Mon Jul 13 15:52:27 2009	(r1201)
@@ -135,7 +135,7 @@
 smlQueueCheckPrio (SmlQueue *queue)
 {
 	g_mutex_lock(queue->mutex);
-	SmlBool ret = (queue->prio == NULL) ? FALSE : TRUE;
+	gboolean ret = (queue->prio == NULL) ? FALSE : TRUE;
 	g_mutex_unlock(queue->mutex);
 	
 	return ret;
@@ -145,7 +145,7 @@
 smlQueueCheck (SmlQueue *queue)
 {
 	g_mutex_lock(queue->mutex);
-	SmlBool ret = (queue->head == NULL) ? FALSE : TRUE;
+	gboolean ret = (queue->head == NULL) ? FALSE : TRUE;
 	g_mutex_unlock(queue->mutex);
 	
 	return ret;

Modified: trunk/libsyncml/sml_transport.c
==============================================================================
--- trunk/libsyncml/sml_transport.c	Mon Jul 13 15:48:19 2009	(r1200)
+++ trunk/libsyncml/sml_transport.c	Mon Jul 13 15:52:27 2009	(r1201)
@@ -207,7 +207,7 @@
 	smlTrace(TRACE_ENTRY, "%s(%p, %p, %i, %p, %p)", __func__, tsp, link_, type, data, error);
 	smlAssert(tsp);
 
-	SmlBool ret = TRUE;
+	gboolean ret = TRUE;
 	if (tsp->event_callback == NULL)
 	{
 		smlTrace(TRACE_INTERNAL, "%s: no callback available", __func__);

Modified: trunk/libsyncml/syncml.h
==============================================================================
--- trunk/libsyncml/syncml.h	Mon Jul 13 15:48:19 2009	(r1200)
+++ trunk/libsyncml/syncml.h	Mon Jul 13 15:52:27 2009	(r1201)
@@ -64,7 +64,6 @@
 /**************************************************************
  * Structs
  *************************************************************/
-typedef struct SmlError SmlError;
 typedef struct SmlTransport SmlTransport;
 typedef struct SmlParser SmlParser;
 typedef struct SmlAssembler SmlAssembler;
@@ -84,7 +83,6 @@
 typedef struct SmlObject SmlObject;
 typedef struct SmlManager SmlManager;
 typedef struct SmlLink SmlLink;
-typedef int SmlBool;
 
 #include <libsyncml/sml_defines.h>
 #include <libsyncml/sml_error.h>

Modified: trunk/tools/syncml-obex-client.c
==============================================================================
--- trunk/tools/syncml-obex-client.c	Mon Jul 13 15:48:19 2009	(r1200)
+++ trunk/tools/syncml-obex-client.c	Mon Jul 13 15:52:27 2009	(r1201)
@@ -50,7 +50,7 @@
 GList *dbSlow = NULL;
 GList *dbTypes = NULL;
 
-SmlBool onlyInfo = FALSE;
+gboolean onlyInfo = FALSE;
 char *useTimeAnchor = NULL;
 unsigned int recvLimit = 65535;
 unsigned int maxObjSize = 3000000;
@@ -87,7 +87,7 @@
 	exit (ecode);
 }
 
-static SmlBool _recv_change(SmlDsSession *dsession, SmlChangeType type, const char *uid, char *data, unsigned int size, const char *contenttype, void *userdata, SmlError **error)
+static gboolean _recv_change(SmlDsSession *dsession, SmlChangeType type, const char *uid, char *data, unsigned int size, const char *contenttype, void *userdata, SmlError **error)
 {
 	smlTrace(TRACE_ENTRY, "%s(%p, %i, %s, %p, %i, %s, %p, %p)", __func__, dsession, type, VA_STRING(uid), data, size, VA_STRING(contenttype), userdata, error);
 	
@@ -207,7 +207,7 @@
 	smlTrace(TRACE_EXIT, "%s", __func__);
 }
 
-static SmlBool _recv_alert(SmlDsSession *dsession, SmlAlertType type, const char *last, const char *next, void *userdata)
+static gboolean _recv_alert(SmlDsSession *dsession, SmlAlertType type, const char *last, const char *next, void *userdata)
 {
 	smlTrace(TRACE_ENTRY, "%s(%p, %i, %s, %s, %p)", __func__, dsession, type, VA_STRING(last), VA_STRING(next), userdata);
 	SmlError *error = NULL;
@@ -217,7 +217,7 @@
 	
 	printf("Received an Alert for the DS Server at %s: Type: %i, Last %s, Next %s\n", smlDsSessionGetLocation(dsession), type, last, next);
 	
-	SmlBool slow = FALSE;
+	gboolean slow = FALSE;
 	int i = 0;
 	for (i = 0; i < g_list_length(dbTypes); i++) {
 		if (!strcmp(smlDsSessionGetContentType(dsession), g_list_nth_data(dbTypes, i))) {
@@ -278,10 +278,10 @@
 	smlTrace(TRACE_EXIT, "%s", __func__);
 }
 
-SmlBool dumpinfo = FALSE;
-SmlBool useStringTable = FALSE;
-SmlBool useNumberOfChanges = TRUE;
-SmlBool useLargeObjs = TRUE;
+gboolean dumpinfo = FALSE;
+gboolean useStringTable = FALSE;
+gboolean useNumberOfChanges = TRUE;
+gboolean useLargeObjs = TRUE;
 SmlProtocolVersion sessionVersion = SML_VERSION_UNKNOWN;
 SmlDevInf *deviceDevinf = NULL;
 SmlDevInf *devinf = NULL;