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

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

Author: bellmich
Date: Mon Jun 29 14:03:35 2009
New Revision: 1134
URL: http://libsyncml.opensync.org/changeset/1134

Log:
- moved code from smlDevInfFromResult to sml_devinf_obj.c
- removed function smlDevInfFromResult
- fixed warning in check_xml_parser.c (missing include)

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:53:07 2009	(r1133)
+++ trunk/libsyncml/objects/sml_devinf_obj.c	Mon Jun 29 14:03:35 2009	(r1134)
@@ -122,9 +122,27 @@
 				goto error;
 		}
 
-		/* cache device information */
+		/* verify that it is a real result with data */
 
-		as->recvDevInf = smlDevInfFromResult(result, &error);
+		if (result->type != SML_COMMAND_TYPE_RESULTS) {
+			smlErrorSet(&error, SML_ERROR_GENERIC, "devinf command was not a result");
+			goto error;
+		}
+	
+		SmlItem *item = result->private.results.status->item;
+		if (!item) {
+			smlErrorSet(&error, SML_ERROR_GENERIC, "devinf result did not have a item");
+			goto error;
+		}
+
+		char *data = NULL;
+		unsigned int size = 0;
+		if (!smlItemGetData(item, &data, &size, &error))
+			goto error;
+	
+		/* parse and cache device information */
+
+		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:53:07 2009	(r1133)
+++ trunk/libsyncml/sml_devinf.c	Mon Jun 29 14:03:35 2009	(r1134)
@@ -29,37 +29,3 @@
 #include "parser/sml_xml_parse.h"
 #include "sml_error_internals.h"
 
-SmlDevInf *smlDevInfFromResult(SmlCommand *result, SmlError **error)
-{
-	smlTrace(TRACE_ENTRY, "%s(%p, %p)", __func__, result, error);
-	CHECK_ERROR_REF
-	smlAssert(result);
-	
-	if (result->type != SML_COMMAND_TYPE_RESULTS) {
-		smlErrorSet(error, SML_ERROR_GENERIC, "devinf command was not a result");
-		goto error;
-	}
-	
-	SmlItem *item = result->private.results.status->item;
-	if (!item) {
-		smlErrorSet(error, SML_ERROR_GENERIC, "devinf result did not have a item");
-		goto error;
-	}
-	
-	char *data = NULL;
-	unsigned int size = 0;
-	if (!smlItemGetData(item, &data, &size, error))
-		goto error;
-	
-	SmlDevInf *devinf = smlXmlDevInfParse(data, size, error);
-	if (!devinf)
-		goto error;
-	
-	smlTrace(TRACE_EXIT, "%s", __func__);
-	return devinf;
-	
-error:
-	smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(error));
-	return NULL;
-}
-

Modified: trunk/libsyncml/sml_devinf.h
==============================================================================
--- trunk/libsyncml/sml_devinf.h	Mon Jun 29 13:53:07 2009	(r1133)
+++ trunk/libsyncml/sml_devinf.h	Mon Jun 29 14:03:35 2009	(r1134)
@@ -37,7 +37,6 @@
 #include <libsyncml/dev_inf_api/sml_dev_inf_data_store.h>
 #include <libsyncml/dev_inf_api/sml_dev_inf.h>
 
-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:53:07 2009	(r1133)
+++ trunk/tests/check_xml_parser.c	Mon Jun 29 14:03:35 2009	(r1134)
@@ -21,6 +21,7 @@
  
 #include "tests/support.h"
 
+#include <libsyncml/parser/sml_xml_parse.h>
 #include <libsyncml/sml_command_internals.h>
 #include <libsyncml/sml_elements_internals.h>