[Opensync-commits] r1133 - in trunk: libsyncml libsyncml/objects tests

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

Author: bellmich
Date: Mon Jun 29 13:53:07 2009
New Revision: 1133
URL: http://libsyncml.opensync.org/changeset/1133

Log:
remove useless function smlDevInfParse

Modified:
   trunk/libsyncml/objects/sml_devinf_obj.c
   trunk/libsyncml/sml_devinf.c
   trunk/libsyncml/sml_devinf.h
   trunk/tests/check_xml_parser.c

Modified: trunk/libsyncml/objects/sml_devinf_obj.c
==============================================================================
--- trunk/libsyncml/objects/sml_devinf_obj.c	Mon Jun 29 13:34:21 2009	(r1132)
+++ trunk/libsyncml/objects/sml_devinf_obj.c	Mon Jun 29 13:53:07 2009	(r1133)
@@ -28,6 +28,7 @@
 #include <libsyncml/sml_elements_internals.h>
 #include <libsyncml/sml_command_internals.h>
 #include "libsyncml/sml_error_internals.h"
+#include "libsyncml/parser/sml_xml_parse.h"
 
 #ifdef WIN32
 #include <windef.h>
@@ -315,7 +316,7 @@
 			goto error;
 	}
 
-	as->recvDevInf = smlDevInfParse(data, size, &error);
+	as->recvDevInf = smlXmlDevInfParse(data, size, &error);
 	if (!as->recvDevInf)
 		goto error;
 

Modified: trunk/libsyncml/sml_devinf.c
==============================================================================
--- trunk/libsyncml/sml_devinf.c	Mon Jun 29 13:34:21 2009	(r1132)
+++ trunk/libsyncml/sml_devinf.c	Mon Jun 29 13:53:07 2009	(r1133)
@@ -29,25 +29,6 @@
 #include "parser/sml_xml_parse.h"
 #include "sml_error_internals.h"
 
-SmlDevInf *smlDevInfParse(const char *data, unsigned int length, SmlError **error)
-{
-	smlTrace(TRACE_ENTRY, "%s(%p, %i, %p)", __func__, data, length, error);
-	CHECK_ERROR_REF
-	smlAssert(data);
-	smlAssert(length);
-	
-	SmlDevInf *devinf = smlXmlDevInfParse(data, length, error);
-	if (!devinf)
-		goto error;
-	
-	smlTrace(TRACE_EXIT, "%s", __func__);
-	return devinf;
-	
-error:
-	smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(error));
-	return NULL;
-}
-
 SmlDevInf *smlDevInfFromResult(SmlCommand *result, SmlError **error)
 {
 	smlTrace(TRACE_ENTRY, "%s(%p, %p)", __func__, result, error);
@@ -70,7 +51,7 @@
 	if (!smlItemGetData(item, &data, &size, error))
 		goto error;
 	
-	SmlDevInf *devinf = smlDevInfParse(data, size, error);
+	SmlDevInf *devinf = smlXmlDevInfParse(data, size, error);
 	if (!devinf)
 		goto error;
 	

Modified: trunk/libsyncml/sml_devinf.h
==============================================================================
--- trunk/libsyncml/sml_devinf.h	Mon Jun 29 13:34:21 2009	(r1132)
+++ trunk/libsyncml/sml_devinf.h	Mon Jun 29 13:53:07 2009	(r1133)
@@ -37,9 +37,6 @@
 #include <libsyncml/dev_inf_api/sml_dev_inf_data_store.h>
 #include <libsyncml/dev_inf_api/sml_dev_inf.h>
 
-void smlDevInfConfigureSession(SmlDevInf *devinf, SmlSession *session);
-
-SmlDevInf *smlDevInfParse(const char *data, unsigned int length, SmlError **error);
 SmlDevInf *smlDevInfFromResult(SmlCommand *result, SmlError **error);
 
 #endif //_SML_DEVINF_H_

Modified: trunk/tests/check_xml_parser.c
==============================================================================
--- trunk/tests/check_xml_parser.c	Mon Jun 29 13:34:21 2009	(r1132)
+++ trunk/tests/check_xml_parser.c	Mon Jun 29 13:53:07 2009	(r1133)
@@ -1270,7 +1270,7 @@
 	sml_fail_unless(smlItemGetData(cmd->private.access.item, &buffer, &size, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	
-	SmlDevInf *devinf = smlDevInfParse(buffer, size, &error);
+	SmlDevInf *devinf = smlXmlDevInfParse(buffer, size, &error);
 	sml_fail_unless(devinf != NULL, "%s", smlErrorPrint(&error));
 	sml_fail_unless(error == NULL, NULL);
 	g_object_unref(devinf);
@@ -1330,7 +1330,7 @@
 	sml_fail_unless(smlItemGetData(cmd->private.access.item, &buffer, &size, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	
-	SmlDevInf *devinf = smlDevInfParse(buffer, size, &error);
+	SmlDevInf *devinf = smlXmlDevInfParse(buffer, size, &error);
 	sml_fail_unless(devinf != NULL, NULL);
 	sml_fail_unless(error == NULL, NULL);
 	g_object_unref(devinf);
@@ -1387,7 +1387,7 @@
 	sml_fail_unless(smlItemGetData(cmd->private.access.item, &buffer, &size, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	
-	SmlDevInf *devinf = smlDevInfParse(buffer, size, &error);
+	SmlDevInf *devinf = smlXmlDevInfParse(buffer, size, &error);
 	sml_fail_unless(devinf != NULL, NULL);
 	sml_fail_unless(error == NULL, NULL);
 	g_object_unref(devinf);
@@ -1453,7 +1453,7 @@
 	sml_fail_unless(smlItemGetData(cmd->private.access.item, &buffer, &size, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	
-	SmlDevInf *devinf = smlDevInfParse(buffer, size, &error);
+	SmlDevInf *devinf = smlXmlDevInfParse(buffer, size, &error);
 	sml_fail_unless(devinf != NULL, "%s", smlErrorPrint(&error));
 	sml_fail_unless(error == NULL, NULL);
 	g_object_unref(devinf);
@@ -1616,7 +1616,7 @@
 	sml_fail_unless(smlItemGetData(cmd->private.access.item, &buffer, &size, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	
-	SmlDevInf *devinf = smlDevInfParse(buffer, size, &error);
+	SmlDevInf *devinf = smlXmlDevInfParse(buffer, size, &error);
 	sml_fail_unless(devinf != NULL, NULL);
 	sml_fail_unless(error == NULL, NULL);
 	g_object_unref(devinf);
@@ -1684,7 +1684,7 @@
 	sml_fail_unless(smlItemGetData(cmd->private.access.item, &buffer, &size, &error), NULL);
 	sml_fail_unless(error == NULL, NULL);
 	
-	SmlDevInf *devinf = smlDevInfParse(buffer, size, &error);
+	SmlDevInf *devinf = smlXmlDevInfParse(buffer, size, &error);
 	sml_fail_unless(devinf != NULL, NULL);
 	sml_fail_unless(error == NULL, NULL);
 	g_object_unref(devinf);