[Opensync-commits] r1240 - trunk/libsyncml/data_sync_api

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

Author: bellmich
Date: Fri Aug  7 19:49:19 2009
New Revision: 1240
URL: http://libsyncml.opensync.org/changeset/1240

Log:
adapted OMA DS client and server implementation to reduced SmlLocation API

Modified:
   trunk/libsyncml/data_sync_api/data_sync_client.c
   trunk/libsyncml/data_sync_api/data_sync_server.c

Modified: trunk/libsyncml/data_sync_api/data_sync_client.c
==============================================================================
--- trunk/libsyncml/data_sync_api/data_sync_client.c	Fri Aug  7 19:48:10 2009	(r1239)
+++ trunk/libsyncml/data_sync_api/data_sync_client.c	Fri Aug  7 19:49:19 2009	(r1240)
@@ -127,10 +127,7 @@
 					            "Cannot create new SmlLocation object - out of memory.");
 					goto error;
 				}
-				if (!sml_location_set_uri(source, datastore->sourceUri, &error)) {
-					g_object_unref(source);
-					goto error;
-				}
+				sml_location_set_uri(source, datastore->sourceUri);
 				SmlCommand *alert = NULL;
 				alert = smlCommandNewAlert(
 						SML_ALERT_SLOW_SYNC,
@@ -342,8 +339,7 @@
 			g_set_error(error, SML_ERROR, SML_ERROR_GENERIC, "Cannot create new SmlLocation object - out of memory.");
 			goto error;
 		}
-		if (!sml_location_set_uri(loc, datastore->sourceUri, error))
-			goto error;
+		sml_location_set_uri(loc, datastore->sourceUri);
 		
 		datastore->server = smlDsClientNew(datastore->contentType, loc, loc, error);
 		g_object_unref(loc);

Modified: trunk/libsyncml/data_sync_api/data_sync_server.c
==============================================================================
--- trunk/libsyncml/data_sync_api/data_sync_server.c	Fri Aug  7 19:48:10 2009	(r1239)
+++ trunk/libsyncml/data_sync_api/data_sync_server.c	Fri Aug  7 19:49:19 2009	(r1240)
@@ -258,8 +258,7 @@
 			g_set_error(error, SML_ERROR, SML_ERROR_GENERIC, "Cannot create new SmlLocation object - out of memory.");
 			goto error;
 		}
-		if (!sml_location_set_uri(loc, datastore->sourceUri, error))
-			goto error;
+		sml_location_set_uri(loc, datastore->sourceUri);
 		
 		datastore->server = smlDsServerNew(datastore->contentType, loc, error);
 		if (!datastore->server) {