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

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

Author: bellmich
Date: Mon Jun 29 12:14:25 2009
New Revision: 1125
URL: http://libsyncml.opensync.org/changeset/1125

Log:
moved smlDevInfDevTypeToString to SmlXmlParser

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

Modified: trunk/libsyncml/parser/sml_xml_assm.c
==============================================================================
--- trunk/libsyncml/parser/sml_xml_assm.c	Mon Jun 29 12:05:07 2009	(r1124)
+++ trunk/libsyncml/parser/sml_xml_assm.c	Mon Jun 29 12:14:25 2009	(r1125)
@@ -207,6 +207,33 @@
 	return FALSE;
 }
 
+static const char *_smlAssembleDevInfDevType(SmlDevInfDevTyp type, SmlError **error)
+{
+	CHECK_ERROR_REF
+
+	switch (type) {
+		case SML_DEVINF_DEVTYP_PAGER:
+			return SML_ELEMENT_DEVTYP_PAGER;
+		case SML_DEVINF_DEVTYP_HANDHELD:
+			return SML_ELEMENT_DEVTYP_HANDHELD;
+		case SML_DEVINF_DEVTYP_PDA:
+			return SML_ELEMENT_DEVTYP_PDA;
+		case SML_DEVINF_DEVTYP_PHONE:
+			return SML_ELEMENT_DEVTYP_PHONE;
+		case SML_DEVINF_DEVTYP_SMARTPHONE:
+			return SML_ELEMENT_DEVTYP_SMARTPHONE;
+		case SML_DEVINF_DEVTYP_SERVER:
+			return SML_ELEMENT_DEVTYP_SERVER;
+		case SML_DEVINF_DEVTYP_WORKSTATION:
+			return SML_ELEMENT_DEVTYP_WORKSTATION;
+		default:
+			smlErrorSet(error, SML_ERROR_GENERIC, "The devince information DevTyp \"%i\" is unknown.", type);
+			/* fall through! */
+	}
+		
+	return NULL;
+}
+
 SmlBool smlLocationAssemble(SmlLocation *location, SmlXmlAssembler *assm, const char *name, SmlError **error)
 {
 	smlTrace(TRACE_ENTRY, "%s(%p, %p, %s, %p)", __func__, location, assm, VA_STRING(name), error);
@@ -2515,7 +2542,7 @@
 		goto error_free_writer;
 		
 	//Devtyp
-	const char *devtype = smlDevInfDevTypeToString(sml_dev_inf_get_dev_typ(devinf), error);
+	const char *devtype = _smlAssembleDevInfDevType(sml_dev_inf_get_dev_typ(devinf), error);
 	if (!devtype)
 		goto error_free_writer;
 		

Modified: trunk/libsyncml/sml_devinf.c
==============================================================================
--- trunk/libsyncml/sml_devinf.c	Mon Jun 29 12:05:07 2009	(r1124)
+++ trunk/libsyncml/sml_devinf.c	Mon Jun 29 12:14:25 2009	(r1125)
@@ -54,33 +54,6 @@
 	return SML_DEVINF_DEVTYP_UNKNOWN;
 }
 
-const char *smlDevInfDevTypeToString(SmlDevInfDevTyp type, SmlError **error)
-{
-	CHECK_ERROR_REF
-
-	switch (type) {
-		case SML_DEVINF_DEVTYP_PAGER:
-			return SML_ELEMENT_DEVTYP_PAGER;
-		case SML_DEVINF_DEVTYP_HANDHELD:
-			return SML_ELEMENT_DEVTYP_HANDHELD;
-		case SML_DEVINF_DEVTYP_PDA:
-			return SML_ELEMENT_DEVTYP_PDA;
-		case SML_DEVINF_DEVTYP_PHONE:
-			return SML_ELEMENT_DEVTYP_PHONE;
-		case SML_DEVINF_DEVTYP_SMARTPHONE:
-			return SML_ELEMENT_DEVTYP_SMARTPHONE;
-		case SML_DEVINF_DEVTYP_SERVER:
-			return SML_ELEMENT_DEVTYP_SERVER;
-		case SML_DEVINF_DEVTYP_WORKSTATION:
-			return SML_ELEMENT_DEVTYP_WORKSTATION;
-		case SML_DEVINF_DEVTYP_UNKNOWN:
-			smlErrorSet(error, SML_ERROR_GENERIC, "Unknown devinf type \"%i\"", type);
-			/* fall through! */
-	}
-		
-	return NULL;
-}
-
 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:05:07 2009	(r1124)
+++ trunk/libsyncml/sml_devinf.h	Mon Jun 29 12:14:25 2009	(r1125)
@@ -38,7 +38,6 @@
 #include <libsyncml/dev_inf_api/sml_dev_inf.h>
 
 SmlDevInfDevTyp smlDevInfDevTypeFromString(const char *name, SmlError **error);
-const char *smlDevInfDevTypeToString(SmlDevInfDevTyp type, SmlError **error);
 
 SmlBool smlDevInfAssemble(SmlDevInf *devinf, char **data, unsigned int *size, SmlError **error);
 SmlCommand *smlDevInfNewResult(SmlCommand *cmd, SmlDevInf *devinf, SmlDevInfVersion version, SmlError **error);