[Opensync-commits] r1126 - in trunk/libsyncml: . parser

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

Author: bellmich
Date: Mon Jun 29 12:19:28 2009
New Revision: 1126
URL: http://libsyncml.opensync.org/changeset/1126

Log:
moved smlDevInfDevTypeFromString to SmlXmlParser

Modified:
   trunk/libsyncml/parser/sml_xml_parse.c
   trunk/libsyncml/sml_devinf.c
   trunk/libsyncml/sml_devinf.h

Modified: trunk/libsyncml/parser/sml_xml_parse.c
==============================================================================
--- trunk/libsyncml/parser/sml_xml_parse.c	Mon Jun 29 12:14:25 2009	(r1125)
+++ trunk/libsyncml/parser/sml_xml_parse.c	Mon Jun 29 12:19:28 2009	(r1126)
@@ -1907,6 +1907,30 @@
 	return TRUE;
 }
 
+SmlDevInfDevTyp _smlParseDevInfDevType(const char *name, SmlError **error)
+{
+	CHECK_ERROR_REF
+
+	if (!strcmp(name, SML_ELEMENT_DEVTYP_PAGER)) {
+		return SML_DEVINF_DEVTYP_PAGER;
+	} else if (!strcmp(name, SML_ELEMENT_DEVTYP_HANDHELD)) {
+		return SML_DEVINF_DEVTYP_HANDHELD;
+	} else if (!strcmp(name, SML_ELEMENT_DEVTYP_PDA)) {
+		return SML_DEVINF_DEVTYP_PDA;
+	} else if (!strcmp(name, SML_ELEMENT_DEVTYP_PHONE)) {
+		return SML_DEVINF_DEVTYP_PHONE;
+	} else if (!strcmp(name, SML_ELEMENT_DEVTYP_SMARTPHONE)) {
+		return SML_DEVINF_DEVTYP_SMARTPHONE;
+	} else if (!strcmp(name, SML_ELEMENT_DEVTYP_SERVER)) {
+		return SML_DEVINF_DEVTYP_SERVER;
+	} else if (!strcmp(name, SML_ELEMENT_DEVTYP_WORKSTATION)) {
+		return SML_DEVINF_DEVTYP_WORKSTATION;
+	} else {
+		smlErrorSet(error, SML_ERROR_GENERIC, "The device information DevTyp \"%s\" is unknown.", name);
+		return SML_DEVINF_DEVTYP_UNKNOWN;
+	}
+}
+
 /** @brief Start the parsing
  * 
  * This will set everything up and parse until the SyncHdr
@@ -3549,7 +3573,7 @@
 			if (!_smlXmlParserGetString(parser, &devtype, SML_ELEMENT_DEVTYP, error))
 				goto error;
 			
-			sml_dev_inf_set_dev_typ(devinf, smlDevInfDevTypeFromString(devtype, error));
+			sml_dev_inf_set_dev_typ(devinf, _smlParseDevInfDevType(devtype, error));
 			smlSafeCFree(&devtype);
 			
 			if (sml_dev_inf_get_dev_typ(devinf) == SML_DEVINF_DEVTYP_UNKNOWN)

Modified: trunk/libsyncml/sml_devinf.c
==============================================================================
--- trunk/libsyncml/sml_devinf.c	Mon Jun 29 12:14:25 2009	(r1125)
+++ trunk/libsyncml/sml_devinf.c	Mon Jun 29 12:19:28 2009	(r1126)
@@ -30,30 +30,6 @@
 #include "parser/sml_xml_parse.h"
 #include "sml_error_internals.h"
 
-SmlDevInfDevTyp smlDevInfDevTypeFromString(const char *name, SmlError **error)
-{
-	CHECK_ERROR_REF
-
-	if (!strcmp(name, SML_ELEMENT_DEVTYP_PAGER)) {
-		return SML_DEVINF_DEVTYP_PAGER;
-	} else if (!strcmp(name, SML_ELEMENT_DEVTYP_HANDHELD)) {
-		return SML_DEVINF_DEVTYP_HANDHELD;
-	} else if (!strcmp(name, SML_ELEMENT_DEVTYP_PDA)) {
-		return SML_DEVINF_DEVTYP_PDA;
-	} else if (!strcmp(name, SML_ELEMENT_DEVTYP_PHONE)) {
-		return SML_DEVINF_DEVTYP_PHONE;
-	} else if (!strcmp(name, SML_ELEMENT_DEVTYP_SMARTPHONE)) {
-		return SML_DEVINF_DEVTYP_SMARTPHONE;
-	} else if (!strcmp(name, SML_ELEMENT_DEVTYP_SERVER)) {
-		return SML_DEVINF_DEVTYP_SERVER;
-	} else if (!strcmp(name, SML_ELEMENT_DEVTYP_WORKSTATION)) {
-		return SML_DEVINF_DEVTYP_WORKSTATION;
-	}
-	
-	smlErrorSet(error, SML_ERROR_GENERIC, "Unknown devinf type name \"%s\"", name);
-	return SML_DEVINF_DEVTYP_UNKNOWN;
-}
-
 void smlDevInfConfigureSession(SmlDevInf *devinf, SmlSession *session)
 {
 	smlTrace(TRACE_ENTRY, "%s(%p, %p)", __func__, devinf, session);

Modified: trunk/libsyncml/sml_devinf.h
==============================================================================
--- trunk/libsyncml/sml_devinf.h	Mon Jun 29 12:14:25 2009	(r1125)
+++ trunk/libsyncml/sml_devinf.h	Mon Jun 29 12:19:28 2009	(r1126)
@@ -37,8 +37,6 @@
 #include <libsyncml/dev_inf_api/sml_dev_inf_data_store.h>
 #include <libsyncml/dev_inf_api/sml_dev_inf.h>
 
-SmlDevInfDevTyp smlDevInfDevTypeFromString(const char *name, SmlError **error);
-
 SmlBool smlDevInfAssemble(SmlDevInf *devinf, char **data, unsigned int *size, SmlError **error);
 SmlCommand *smlDevInfNewResult(SmlCommand *cmd, SmlDevInf *devinf, SmlDevInfVersion version, SmlError **error);
 SmlCommand *smlDevInfNewPut(SmlDevInf *devinf, SmlDevInfVersion version, SmlError **error);