[Opensync-commits] r1200 - in trunk: libsyncml libsyncml/objects libsyncml/parser tests tools

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

Author: bellmich
Date: Mon Jul 13 15:48:19 2009
New Revision: 1200
URL: http://libsyncml.opensync.org/changeset/1200

Log:
fixed several warnings discovered by build host gonzo

Modified:
   trunk/libsyncml/objects/sml_devinf_obj.c
   trunk/libsyncml/objects/sml_ds_server.c
   trunk/libsyncml/parser/sml_xml_assm.c
   trunk/libsyncml/parser/sml_xml_parse.c
   trunk/libsyncml/sml_command.c
   trunk/libsyncml/sml_elements_internals.h
   trunk/libsyncml/sml_notification.c
   trunk/libsyncml/sml_parse.c
   trunk/libsyncml/sml_session.c
   trunk/tests/check_data_sync_api.c
   trunk/tests/check_ds.c
   trunk/tests/check_san.c
   trunk/tests/check_session.c
   trunk/tests/check_sync.c
   trunk/tests/check_wbxml_assembler.c
   trunk/tests/check_wbxml_parser.c
   trunk/tests/check_xml_assembler.c
   trunk/tests/check_xml_parser.c
   trunk/tools/syncml-ds-tool.c

Modified: trunk/libsyncml/objects/sml_devinf_obj.c
==============================================================================
--- trunk/libsyncml/objects/sml_devinf_obj.c	Mon Jul 13 15:21:01 2009	(r1199)
+++ trunk/libsyncml/objects/sml_devinf_obj.c	Mon Jul 13 15:48:19 2009	(r1200)
@@ -143,7 +143,7 @@
 		}
 
 		char *data = NULL;
-		unsigned int size = 0;
+		gsize size = 0;
 		if (!smlItemGetData(item, &data, &size, &error))
 			goto error;
 	
@@ -337,7 +337,7 @@
 	SmlDevInfAgent *agent = userdata;
 	GError *error = NULL;
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	
 	if (!smlItemGetData(cmd->private.access.item, &data, &size, &error))
 		goto error;

Modified: trunk/libsyncml/objects/sml_ds_server.c
==============================================================================
--- trunk/libsyncml/objects/sml_ds_server.c	Mon Jul 13 15:21:01 2009	(r1199)
+++ trunk/libsyncml/objects/sml_ds_server.c	Mon Jul 13 15:48:19 2009	(r1200)
@@ -653,7 +653,7 @@
 					}
 
 					char *data = NULL;
-					unsigned int size = 0;
+					gsize size = 0;
 					if (!smlItemStealData(item, &data, &size, &error))
 						goto error;
 

Modified: trunk/libsyncml/parser/sml_xml_assm.c
==============================================================================
--- trunk/libsyncml/parser/sml_xml_assm.c	Mon Jul 13 15:21:01 2009	(r1199)
+++ trunk/libsyncml/parser/sml_xml_assm.c	Mon Jul 13 15:48:19 2009	(r1200)
@@ -437,7 +437,7 @@
 				goto error;
 		} else {
 			char *data = NULL;
-			unsigned int size = 0;
+			gsize size = 0;
 			if (!smlItemGetData(item, &data, &size, error))
 				goto error;
 			

Modified: trunk/libsyncml/parser/sml_xml_parse.c
==============================================================================
--- trunk/libsyncml/parser/sml_xml_parse.c	Mon Jul 13 15:21:01 2009	(r1199)
+++ trunk/libsyncml/parser/sml_xml_parse.c	Mon Jul 13 15:48:19 2009	(r1200)
@@ -895,7 +895,7 @@
 						break;
 					default:;
 						char *data = NULL;
-						unsigned int size = 0;
+						gsize size = 0;
 						if (!_smlXmlParserGetData(parser, &data, &size, SML_ELEMENT_DATA, error))
 							goto error;
 						

Modified: trunk/libsyncml/sml_command.c
==============================================================================
--- trunk/libsyncml/sml_command.c	Mon Jul 13 15:21:01 2009	(r1199)
+++ trunk/libsyncml/sml_command.c	Mon Jul 13 15:48:19 2009	(r1200)
@@ -707,7 +707,7 @@
 	SmlLocation *source = NULL;
 
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	if (!smlXmlDevInfAssemble(devinf, version, &data, &size, error))
 		goto error;
 	
@@ -790,7 +790,7 @@
 	g_object_unref(source);
 	
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	if (!smlXmlDevInfAssemble(devinf, version, &data, &size, error))
 		goto error;
 	

Modified: trunk/libsyncml/sml_elements_internals.h
==============================================================================
--- trunk/libsyncml/sml_elements_internals.h	Mon Jul 13 15:21:01 2009	(r1199)
+++ trunk/libsyncml/sml_elements_internals.h	Mon Jul 13 15:48:19 2009	(r1200)
@@ -71,8 +71,8 @@
 	gchar *responseURI;
 	gboolean noResponse;
 	guint messageID;
-	guint maxmsgsize;
-	guint maxobjsize;
+	gsize maxmsgsize;
+	gsize maxobjsize;
 	gchar *emi;
 };
 

Modified: trunk/libsyncml/sml_notification.c
==============================================================================
--- trunk/libsyncml/sml_notification.c	Mon Jul 13 15:21:01 2009	(r1199)
+++ trunk/libsyncml/sml_notification.c	Mon Jul 13 15:48:19 2009	(r1200)
@@ -640,7 +640,7 @@
 
 	SmlTransportData *tspdata = NULL;
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 
 	if (!smlNotificationAssemble(san, &data, &size, error))
 		goto error;

Modified: trunk/libsyncml/sml_parse.c
==============================================================================
--- trunk/libsyncml/sml_parse.c	Mon Jul 13 15:21:01 2009	(r1199)
+++ trunk/libsyncml/sml_parse.c	Mon Jul 13 15:48:19 2009	(r1200)
@@ -174,7 +174,7 @@
 
 		/* assemble a SyncML 1.1 notification */
 		char *xmlData = NULL;
-		unsigned int xmlSize = 0;
+		gsize xmlSize = 0;
 		if (!smlNotificationAssemble11(san, &xmlData, &xmlSize, SML_VERSION_12, error))
 		{
 			smlNotificationFree(san);

Modified: trunk/libsyncml/sml_session.c
==============================================================================
--- trunk/libsyncml/sml_session.c	Mon Jul 13 15:21:01 2009	(r1199)
+++ trunk/libsyncml/sml_session.c	Mon Jul 13 15:48:19 2009	(r1200)
@@ -109,7 +109,7 @@
 	smlAssert(session->dataCallback);
 	
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	gboolean end = FALSE;
 	
 	/* Add the latest header */
@@ -239,7 +239,7 @@
 	SmlCommand *frag_cmd = NULL;
 	
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	SmlItem *orig_item = g_list_nth_data(orig_cmd->private.change.items, 0);
 	if (!smlItemGetData(orig_item, &data, &size, error))
 		goto error;
@@ -381,7 +381,7 @@
 		smlAssert(g_list_length(cmd->private.change.items) == 1);
 		
 		char *data = NULL;
-		unsigned int size = 0;
+		gsize size = 0;
 		SmlItem *item = g_list_nth_data(cmd->private.change.items, 0);
 		if (!smlItemGetData(item, &data, &size, error))
 			goto error;
@@ -1287,7 +1287,7 @@
 						 * This is a chunk of the previous item in the buffer.
 						 */
 						char *data = NULL;
-						unsigned int size = 0;
+						gsize size = 0;
 						SmlItem *item = g_list_nth_data(cmd->private.change.items, 0);
 						if (!item)
 							goto error;

Modified: trunk/tests/check_data_sync_api.c
==============================================================================
--- trunk/tests/check_data_sync_api.c	Mon Jul 13 15:21:01 2009	(r1199)
+++ trunk/tests/check_data_sync_api.c	Mon Jul 13 15:48:19 2009	(r1200)
@@ -148,7 +148,7 @@
 			SmlChangeType type,
 			const char *uid,
 			char *data,
-			unsigned int size,
+			gsize size,
 			void *userdata,
 			GError **error)
 {

Modified: trunk/tests/check_ds.c
==============================================================================
--- trunk/tests/check_ds.c	Mon Jul 13 15:21:01 2009	(r1199)
+++ trunk/tests/check_ds.c	Mon Jul 13 15:48:19 2009	(r1200)
@@ -258,7 +258,7 @@
 	return TRUE;
 }
 
-static void _recv_sync(SmlDsSession *dsession, unsigned int numChanges, void *userdata)
+static void _recv_sync(SmlDsSession *dsession, gsize numChanges, void *userdata)
 {
 	smlTrace(TRACE_ENTRY, "%s(%p, %d, %p)", __func__,dsession, numChanges, userdata);
 	
@@ -267,7 +267,7 @@
 	smlTrace(TRACE_EXIT, "%s", __func__);
 }
 
-static gboolean _recv_changes(SmlDsSession *dsession, SmlChangeType type, const char *uid, char *data, unsigned int size, const char *contenttype, void *userdata, GError **error)
+static gboolean _recv_changes(SmlDsSession *dsession, SmlChangeType type, const char *uid, char *data, gsize size, const char *contenttype, void *userdata, GError **error)
 {
 	smlTrace(TRACE_ENTRY, "%s(%p, %i, %s, %s, %i, %s, %p, %p)", __func__, dsession, type, VA_STRING(uid), VA_STRING(data), size, VA_STRING(contenttype), userdata, error);
 

Modified: trunk/tests/check_san.c
==============================================================================
--- trunk/tests/check_san.c	Mon Jul 13 15:21:01 2009	(r1199)
+++ trunk/tests/check_san.c	Mon Jul 13 15:48:19 2009	(r1200)
@@ -89,7 +89,7 @@
 		0x00}; // num syncs + future
 	
 	char *buffer = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(smlNotificationAssemble(san, &buffer, &size, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	
@@ -122,7 +122,7 @@
 		0x00}; // num syncs + future
 	
 	char *buffer = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(smlNotificationAssemble(san, &buffer, &size, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	
@@ -161,7 +161,7 @@
 		0x04, 0x74, 0x74, 0x74, 0x74}; //Server URI;
 	
 	char *buffer = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(smlNotificationAssemble(san, &buffer, &size, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	
@@ -206,7 +206,7 @@
 		0x04, 0x74, 0x74, 0x74, 0x74}; //Server URI;
 	
 	char *buffer = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(smlNotificationAssemble(san, &buffer, &size, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	
@@ -250,7 +250,7 @@
 		0x08, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x63, 0x74, 0x73}; //Server URI;
 	
 	char *buffer = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(smlNotificationAssemble(san, &buffer, &size, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	
@@ -277,7 +277,7 @@
 	sml_fail_unless(error == NULL, NULL);
 	
 	char *buffer = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(smlNotificationAssemble(san, &buffer, &size, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	smlNotificationFree(san);
@@ -544,7 +544,7 @@
 	sml_fail_unless(error == NULL, NULL);
 	
 	char *buffer = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(smlNotificationAssemble(san, &buffer, &size, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	

Modified: trunk/tests/check_session.c
==============================================================================
--- trunk/tests/check_session.c	Mon Jul 13 15:21:01 2009	(r1199)
+++ trunk/tests/check_session.c	Mon Jul 13 15:48:19 2009	(r1200)
@@ -390,7 +390,7 @@
 				smlAssert(smlItemCheck(item));
 				
 				char *data = NULL;
-				unsigned int size = 0;
+				gsize size = 0;
 				smlAssert(smlItemGetData(item, &data, &size, &locerror));
 				
 				smlAssert(size == 8);
@@ -405,7 +405,7 @@
 				smlAssert(smlItemCheck(item));
 
 				char *data = NULL;
-				unsigned int size = 0;
+				gsize size = 0;
 				smlAssert(smlItemGetData(item, &data, &size, &locerror));
 				
 				smlAssert(size == 20);
@@ -420,7 +420,7 @@
 				smlAssert(smlItemCheck(item));
 				
 				char *data = NULL;
-				unsigned int size = 0;
+				gsize size = 0;
 				smlAssert(smlItemGetData(item, &data, &size, &locerror));
 				
 				if (size != 4) {
@@ -2534,7 +2534,7 @@
 	sml_fail_unless(error == NULL, NULL);
 	
 	char *buffer = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(smlNotificationAssemble(san, &buffer, &size, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	smlNotificationFree(san);

Modified: trunk/tests/check_sync.c
==============================================================================
--- trunk/tests/check_sync.c	Mon Jul 13 15:21:01 2009	(r1199)
+++ trunk/tests/check_sync.c	Mon Jul 13 15:48:19 2009	(r1200)
@@ -277,7 +277,7 @@
 	return SML_NO_ERROR;
 }
 
-static void _recv_sync(SmlDsSession *dsession, unsigned int numChanges, void *userdata)
+static void _recv_sync(SmlDsSession *dsession, gsize numChanges, void *userdata)
 {
 	smlTrace(TRACE_ENTRY, "%s(%p, %d, %p)", __func__, dsession, numChanges, userdata);
 	
@@ -287,7 +287,7 @@
 	smlTrace(TRACE_EXIT, "%s", __func__);
 }
 
-static gboolean _recv_changes(SmlDsSession *dsession, SmlChangeType type, const char *uid, char *data, unsigned int size, const char *contenttype, void *userdata, GError **error)
+static gboolean _recv_changes(SmlDsSession *dsession, SmlChangeType type, const char *uid, char *data, gsize size, const char *contenttype, void *userdata, GError **error)
 {
 	smlTrace(TRACE_ENTRY, "%s(%p, %i, %s, %s, %i, %s, %p, %p)", __func__, dsession, type, VA_STRING(uid), VA_STRING(data), size, VA_STRING(contenttype), userdata, error);
 

Modified: trunk/tests/check_wbxml_assembler.c
==============================================================================
--- trunk/tests/check_wbxml_assembler.c	Mon Jul 13 15:21:01 2009	(r1199)
+++ trunk/tests/check_wbxml_assembler.c	Mon Jul 13 15:48:19 2009	(r1200)
@@ -63,7 +63,7 @@
 	sml_fail_unless(assm != NULL, NULL);
 	
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL);
 	sml_fail_unless(error != NULL, NULL);
 	SML_ERROR_FREE(error);
@@ -103,7 +103,7 @@
 	sml_fail_unless(error == NULL, NULL);
 	
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL);
 	sml_fail_unless(error != NULL, NULL);
 	SML_ERROR_FREE(error);
@@ -155,7 +155,7 @@
 	smlStatusUnref(status);
 	
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	sml_fail_unless(data != NULL, NULL);
@@ -210,7 +210,7 @@
 	smlCommandUnref(cmd);
 	
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	sml_fail_unless(data != NULL, NULL);
@@ -283,7 +283,7 @@
 	sml_fail_unless(error == NULL, NULL);
 	
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	sml_fail_unless(data != NULL, NULL);
@@ -389,7 +389,7 @@
 	sml_fail_unless(error == NULL, NULL);
 	
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	sml_fail_unless(data != NULL, NULL);
@@ -449,7 +449,7 @@
 	sml_fail_unless(error == NULL, NULL);
 	
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, FALSE, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	sml_fail_unless(data != NULL, NULL);
@@ -588,7 +588,7 @@
 	smlCommandUnref(cmd3);
 	
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	sml_fail_unless(data != NULL, NULL);
@@ -630,7 +630,7 @@
 	SML_ERROR_FREE(error);
 	
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL);
 	sml_fail_unless(error != NULL, NULL);
 	SML_ERROR_FREE(error);
@@ -663,7 +663,7 @@
 	SML_ERROR_FREE(error);
 	
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL);
 	sml_fail_unless(error != NULL, NULL);
 	SML_ERROR_FREE(error);
@@ -707,7 +707,7 @@
 	smlStatusUnref(status);
 	
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL);
 	sml_fail_unless(error != NULL, NULL);
 	SML_ERROR_FREE(error);
@@ -751,7 +751,7 @@
 	smlStatusUnref(status);
 	
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	smlSafeCFree(&data);
@@ -804,7 +804,7 @@
 	sml_fail_unless(error == NULL, NULL);
 	
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, FALSE, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	sml_fail_unless(data != NULL, NULL);
@@ -909,7 +909,7 @@
 	sml_fail_unless(error == NULL, NULL);
 	
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, FALSE, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	sml_fail_unless(data != NULL, NULL);

Modified: trunk/tests/check_wbxml_parser.c
==============================================================================
--- trunk/tests/check_wbxml_parser.c	Mon Jul 13 15:21:01 2009	(r1199)
+++ trunk/tests/check_wbxml_parser.c	Mon Jul 13 15:48:19 2009	(r1200)
@@ -41,7 +41,7 @@
 	
 #ifdef ENABLE_WBXML
 	char *buffer = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(smlWbxmlConvertTo(NULL, data, &buffer, &size, &error), NULL);
 
 	if (!smlParserStart(parser, buffer, size, &error)) {

Modified: trunk/tests/check_xml_assembler.c
==============================================================================
--- trunk/tests/check_xml_assembler.c	Mon Jul 13 15:21:01 2009	(r1199)
+++ trunk/tests/check_xml_assembler.c	Mon Jul 13 15:48:19 2009	(r1200)
@@ -60,7 +60,7 @@
 	sml_fail_unless(assm != NULL, NULL);
 	
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL);
 	sml_fail_unless(error != NULL, NULL);
 	SML_ERROR_FREE(error);
@@ -100,7 +100,7 @@
 	sml_fail_unless(error == NULL, NULL);
 	
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL);
 	sml_fail_unless(error != NULL, NULL);
 	SML_ERROR_FREE(error);
@@ -152,7 +152,7 @@
 	smlStatusUnref(status);
 	
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	sml_fail_unless(data != NULL, NULL);
@@ -208,7 +208,7 @@
 	sml_fail_unless(error == NULL, NULL);
 		
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	sml_fail_unless(data != NULL, NULL);
@@ -277,7 +277,7 @@
 	sml_fail_unless(error == NULL, NULL);
 	
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	sml_fail_unless(data != NULL, NULL);
@@ -390,7 +390,7 @@
 	sml_fail_unless(error == NULL, NULL);
 	
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	sml_fail_unless(data != NULL, NULL);
@@ -452,7 +452,7 @@
 	sml_fail_unless(error == NULL, NULL);
 	
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, FALSE, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	sml_fail_unless(data != NULL, NULL);
@@ -615,7 +615,7 @@
 	sml_fail_unless(error == NULL, NULL);
 	
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	sml_fail_unless(data != NULL, NULL);
@@ -659,7 +659,7 @@
 	SML_ERROR_FREE(error);
 	
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL);
 	sml_fail_unless(error != NULL, NULL);
 	SML_ERROR_FREE(error);
@@ -693,7 +693,7 @@
 	SML_ERROR_FREE(error);
 	
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL);
 	sml_fail_unless(error != NULL, NULL);
 	SML_ERROR_FREE(error);
@@ -738,7 +738,7 @@
 	smlStatusUnref(status);
 	
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL);
 	sml_fail_unless(error != NULL, NULL);
 	SML_ERROR_FREE(error);
@@ -783,7 +783,7 @@
 	smlStatusUnref(status);
 	
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	
@@ -837,7 +837,7 @@
 	sml_fail_unless(error == NULL, NULL);
 	
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, FALSE, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	sml_fail_unless(data != NULL, NULL);
@@ -925,7 +925,7 @@
 	sml_fail_unless(error == NULL, NULL);
 	
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, FALSE, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	sml_fail_unless(data != NULL, NULL);
@@ -998,7 +998,7 @@
 	sml_fail_unless(error == NULL, NULL);
 	
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, FALSE, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	sml_fail_unless(data != NULL, NULL);
@@ -1071,7 +1071,7 @@
 	smlStatusUnref(status);
 	
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, FALSE, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	sml_fail_unless(data != NULL, NULL);
@@ -1176,7 +1176,7 @@
 	sml_fail_unless(error == NULL, NULL);
 	
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	/* Must fail since nothing has been added at all */
 	sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, FALSE, &error), NULL);
 	sml_fail_unless(error != NULL, NULL);
@@ -1346,7 +1346,7 @@
 	sml_fail_unless(error == NULL, NULL);
 	
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	/* Must fail since nothing has been added at all */
 	sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, FALSE, &error), NULL);
 	sml_fail_unless(error != NULL, NULL);
@@ -1473,7 +1473,7 @@
 	}
 	
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	sml_fail_unless(data != NULL, NULL);
@@ -1531,7 +1531,7 @@
 		SmlAssemblerResult res = smlAssemblerAddStatus(assm, status, &error);
 		if (res == SML_ASSEMBLER_RESULT_MISMATCH) {
 			char *data = NULL;
-			unsigned int size = 0;
+			gsize size = 0;
 			sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, FALSE, &error), NULL);
 			sml_fail_unless(error == NULL, NULL);
 			sml_fail_unless(data != NULL, NULL);
@@ -1560,7 +1560,7 @@
 		
 		if (res == SML_ASSEMBLER_RESULT_MISMATCH) {
 			char *data = NULL;
-			unsigned int size = 0;
+			gsize size = 0;
 			sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, FALSE, &error), NULL);
 			sml_fail_unless(error == NULL, NULL);
 			sml_fail_unless(data != NULL, NULL);
@@ -1584,7 +1584,7 @@
 	}
 	
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	sml_fail_unless(data != NULL, NULL);
@@ -1661,7 +1661,7 @@
 	}
 	
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	sml_fail_unless(data != NULL, NULL);
@@ -1758,7 +1758,7 @@
 	sml_fail_unless(error == NULL, NULL);
 	
 	char *data = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	sml_fail_unless(data != NULL, NULL);

Modified: trunk/tests/check_xml_parser.c
==============================================================================
--- trunk/tests/check_xml_parser.c	Mon Jul 13 15:21:01 2009	(r1199)
+++ trunk/tests/check_xml_parser.c	Mon Jul 13 15:48:19 2009	(r1200)
@@ -1209,7 +1209,7 @@
 	sml_fail_unless(cmd->size == 10, NULL);
 	
 	char *data2 = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(smlItemGetData(item, &data2, &size, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	
@@ -1268,7 +1268,7 @@
 	sml_fail_unless(cmd->private.access.item != NULL, NULL);
 	
 	char *buffer = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(smlItemGetData(cmd->private.access.item, &buffer, &size, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	
@@ -1328,7 +1328,7 @@
 	sml_fail_unless(cmd->private.access.item != NULL, NULL);
 	
 	char *buffer = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(smlItemGetData(cmd->private.access.item, &buffer, &size, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	
@@ -1385,7 +1385,7 @@
 	sml_fail_unless(cmd->private.access.item != NULL, NULL);
 	
 	char *buffer = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(smlItemGetData(cmd->private.access.item, &buffer, &size, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	
@@ -1451,7 +1451,7 @@
 	sml_fail_unless(cmd->private.access.item != NULL, NULL);
 	
 	char *buffer = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(smlItemGetData(cmd->private.access.item, &buffer, &size, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	
@@ -1614,7 +1614,7 @@
 	sml_fail_unless(cmd->private.access.item != NULL, NULL);
 	
 	char *buffer = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(smlItemGetData(cmd->private.access.item, &buffer, &size, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	
@@ -1682,7 +1682,7 @@
 	sml_fail_unless(cmd->private.access.item != NULL, NULL);
 	
 	char *buffer = NULL;
-	unsigned int size = 0;
+	gsize size = 0;
 	sml_fail_unless(smlItemGetData(cmd->private.access.item, &buffer, &size, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	

Modified: trunk/tools/syncml-ds-tool.c
==============================================================================
--- trunk/tools/syncml-ds-tool.c	Mon Jul 13 15:21:01 2009	(r1199)
+++ trunk/tools/syncml-ds-tool.c	Mon Jul 13 15:48:19 2009	(r1200)
@@ -536,7 +536,7 @@
 			SmlChangeType type,
 			const char *uid,
 			char *data,
-			unsigned int size,
+			gsize size,
 			void *userdata,
 			GError **error)
 {