[Opensync-commits] r1150 - trunk/libsyncml

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

Author: bellmich
Date: Fri Jul  3 16:16:21 2009
New Revision: 1150
URL: http://libsyncml.opensync.org/changeset/1150

Log:
replaced SmlBool with GError

Modified:
   trunk/libsyncml/sml_command.c
   trunk/libsyncml/sml_command_internals.h
   trunk/libsyncml/sml_elements_internals.h
   trunk/libsyncml/sml_notification_internals.h
   trunk/libsyncml/sml_parse.c
   trunk/libsyncml/sml_parse.h
   trunk/libsyncml/sml_session_internals.h

Modified: trunk/libsyncml/sml_command.c
==============================================================================
--- trunk/libsyncml/sml_command.c	Fri Jul  3 16:13:03 2009	(r1149)
+++ trunk/libsyncml/sml_command.c	Fri Jul  3 16:16:21 2009	(r1150)
@@ -201,7 +201,7 @@
 	return NULL;
 }
 
-SmlBool
+gboolean
 smlStatusIsResult (SmlStatus *status)
 {
 	return status->type == SML_COMMAND_TYPE_RESULTS ? TRUE : FALSE;
@@ -883,7 +883,7 @@
 	return NULL;
 }
 
-SmlBool
+gboolean
 smlCommandAddMapItem (SmlCommand *map,
                       SmlMapItem *item,
                       GError **error)

Modified: trunk/libsyncml/sml_command_internals.h
==============================================================================
--- trunk/libsyncml/sml_command_internals.h	Fri Jul  3 16:13:03 2009	(r1149)
+++ trunk/libsyncml/sml_command_internals.h	Fri Jul  3 16:16:21 2009	(r1150)
@@ -40,7 +40,7 @@
 typedef struct SmlCommandSyncPrivate {
 	gsize numChanged;
 	gsize maxObjSize;
-	SmlBool hasNumChanged;
+	gboolean hasNumChanged;
 } SmlCommandSyncPrivate;
 
 typedef struct SmlCommandAccessPrivate {
@@ -81,14 +81,14 @@
 	SmlPendingStatus *pendingReply;
 	GList *children;
 	SmlCommand *parent;
-	SmlBool noResp;
+	gboolean noResp;
 	
 	gsize size;
 	
 	/** True if the command has already seen a mismatch
 	 * in size. If a second mismatch happens, the command is
 	 * simply too large */
-	SmlBool pushedBack;
+	gboolean pushedBack;
 };
 
 struct SmlStatus {

Modified: trunk/libsyncml/sml_elements_internals.h
==============================================================================
--- trunk/libsyncml/sml_elements_internals.h	Fri Jul  3 16:13:03 2009	(r1149)
+++ trunk/libsyncml/sml_elements_internals.h	Fri Jul  3 16:16:21 2009	(r1150)
@@ -49,11 +49,11 @@
 	gsize size;
 	
 	gchar *contenttype;
-	SmlBool moreData;
+	gboolean moreData;
 	
-	SmlBool disabled;
+	gboolean disabled;
 	/** If set to true, libsyncml will omit the cdata tags */
-	SmlBool raw;
+	gboolean raw;
 };
 
 struct SmlMapItem {
@@ -69,7 +69,7 @@
 	SmlLocation *source;
 	SmlLocation *target;
 	gchar *responseURI;
-	SmlBool noResponse;
+	gboolean noResponse;
 	guint messageID;
 	guint maxmsgsize;
 	guint maxobjsize;

Modified: trunk/libsyncml/sml_notification_internals.h
==============================================================================
--- trunk/libsyncml/sml_notification_internals.h	Fri Jul  3 16:13:03 2009	(r1149)
+++ trunk/libsyncml/sml_notification_internals.h	Fri Jul  3 16:16:21 2009	(r1150)
@@ -53,7 +53,7 @@
 	gchar *serverURI;
 };
 
-SmlBool smlNotificationAssemble11(
+gboolean smlNotificationAssemble11(
 	SmlNotification *san,
 	gchar **data,
 	gsize *size,

Modified: trunk/libsyncml/sml_parse.c
==============================================================================
--- trunk/libsyncml/sml_parse.c	Fri Jul  3 16:13:03 2009	(r1149)
+++ trunk/libsyncml/sml_parse.c	Fri Jul  3 16:16:21 2009	(r1150)
@@ -619,7 +619,7 @@
 		}
 	}
 
-	SmlBool noCmdID = FALSE;
+	gboolean noCmdID = FALSE;
 	if (!cmd->cmdID) {
 		noCmdID = TRUE;
 		/* FIXME: This code does not support more
@@ -1062,7 +1062,7 @@
 	smlTrace(TRACE_ENTRY, "%s(%p)", __func__, assm);
 	smlAssert(assm);
 	
-	SmlBool ret = assm->empty;
+	gboolean ret = assm->empty;
 	
 	smlTrace(TRACE_EXIT, "%s: %i", __func__, ret);
 	return ret;
@@ -1079,7 +1079,7 @@
 	smlAssert(assm);
 	smlAssert(assm->functions.missing_status);
 	
-	SmlBool ret = assm->functions.missing_status(assm->assm_userdata);
+	gboolean ret = assm->functions.missing_status(assm->assm_userdata);
 	
 	return ret;
 }

Modified: trunk/libsyncml/sml_parse.h
==============================================================================
--- trunk/libsyncml/sml_parse.h	Fri Jul  3 16:13:03 2009	(r1149)
+++ trunk/libsyncml/sml_parse.h	Fri Jul  3 16:16:21 2009	(r1150)
@@ -120,9 +120,9 @@
 gsize smlAssemblerGetRemoteMaxObjSize (SmlAssembler *assm);
 gsize smlAssemblerSetRemoteMaxObjSize (SmlAssembler *assm, gsize limit);
 
-SmlBool smlAssemblerIsEmpty         (SmlAssembler *assm);
-SmlBool smlAssemblerIsStatusMissing (SmlAssembler *assm);
-SmlBool smlAssemblerGetNextCmdRef   (SmlAssembler *assm, guint *cmdRef, guint *msgRef);
+gboolean smlAssemblerIsEmpty         (SmlAssembler *assm);
+gboolean smlAssemblerIsStatusMissing (SmlAssembler *assm);
+gboolean smlAssemblerGetNextCmdRef   (SmlAssembler *assm, guint *cmdRef, guint *msgRef);
 
 /* If you want to parse OMA DS 1.2 SANs then the manager is required. */
 void smlParserSetManager (SmlParser *parser, SmlManager *manager);

Modified: trunk/libsyncml/sml_session_internals.h
==============================================================================
--- trunk/libsyncml/sml_session_internals.h	Fri Jul  3 16:13:03 2009	(r1149)
+++ trunk/libsyncml/sml_session_internals.h	Fri Jul  3 16:16:21 2009	(r1150)
@@ -30,7 +30,7 @@
 	SmlProtocolType protocol;
 	SmlSessionType sessionType;
 	SmlAssembler *assembler;
-	SmlBool onlyReplace;
+	gboolean onlyReplace;
 	
 	SmlSessionEventCallback eventCallback;
 	void *eventCallbackUserdata;