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

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

Author: bellmich
Date: Mon Jun 29 12:26:40 2009
New Revision: 1127
URL: http://libsyncml.opensync.org/changeset/1127

Log:
moved smlDevInfSyncCapConvert to SmlXmlParser

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

Modified: trunk/libsyncml/parser/sml_xml_parse.c
==============================================================================
--- trunk/libsyncml/parser/sml_xml_parse.c	Mon Jun 29 12:19:28 2009	(r1126)
+++ trunk/libsyncml/parser/sml_xml_parse.c	Mon Jun 29 12:26:40 2009	(r1127)
@@ -1931,6 +1931,46 @@
 	}
 }
 
+SmlDevInfSyncCap _smlParseDevInfSyncCap(unsigned int id, SmlError **error)
+{
+	smlTrace(TRACE_ENTRY, "%s(%u, %p)", __func__, id, error);
+	CHECK_ERROR_REF
+	SmlDevInfSyncCap result = SML_DEVINF_SYNCTYPE_UNKNOWN;
+
+	switch (id)
+	{
+		case SML_DEVINF_SYNCTYPE_TWO_WAY:
+			result = SML_DEVINF_SYNCTYPE_TWO_WAY;
+			break;
+		case SML_DEVINF_SYNCTYPE_SLOW_SYNC:
+			result = SML_DEVINF_SYNCTYPE_SLOW_SYNC;
+			break;
+		case SML_DEVINF_SYNCTYPE_ONE_WAY_FROM_CLIENT:
+			result = SML_DEVINF_SYNCTYPE_ONE_WAY_FROM_CLIENT;
+			break;
+		case SML_DEVINF_SYNCTYPE_REFRESH_FROM_CLIENT:
+			result = SML_DEVINF_SYNCTYPE_REFRESH_FROM_CLIENT;
+			break;
+		case SML_DEVINF_SYNCTYPE_ONE_WAY_FROM_SERVER:
+			result = SML_DEVINF_SYNCTYPE_ONE_WAY_FROM_SERVER;
+			break;
+		case SML_DEVINF_SYNCTYPE_REFRESH_FROM_SERVER:
+			result = SML_DEVINF_SYNCTYPE_REFRESH_FROM_SERVER;
+			break;
+		case SML_DEVINF_SYNCTYPE_SERVER_ALERTED_SYNC:
+			result = SML_DEVINF_SYNCTYPE_SERVER_ALERTED_SYNC;
+			break;
+		default:
+			smlErrorSet(error, SML_ERROR_GENERIC,
+				"The synchronization type %u is unknwon.", id);
+			smlTrace(TRACE_EXIT_ERROR, "%s - %s", __func__, smlErrorPrint(error));
+			return SML_DEVINF_SYNCTYPE_UNKNOWN;
+			break;
+	}
+	smlTrace(TRACE_EXIT, "%s - %u", __func__, result);
+	return result;
+}
+
 /** @brief Start the parsing
  * 
  * This will set everything up and parse until the SyncHdr
@@ -2651,7 +2691,7 @@
 			if (!_smlXmlParserGetID(parser, &id, SML_ELEMENT_SYNCTYPE, error))
 				goto error;
 			id = 1 << (id - 1);
-			SmlDevInfSyncCap synccap = smlDevInfSyncCapConvert(id, error);
+			SmlDevInfSyncCap synccap = _smlParseDevInfSyncCap(id, error);
 			if (synccap == SML_DEVINF_SYNCTYPE_UNKNOWN &&
 			    error != NULL)
 				goto error;

Modified: trunk/libsyncml/sml_devinf.c
==============================================================================
--- trunk/libsyncml/sml_devinf.c	Mon Jun 29 12:19:28 2009	(r1126)
+++ trunk/libsyncml/sml_devinf.c	Mon Jun 29 12:26:40 2009	(r1127)
@@ -267,43 +267,3 @@
 }
 
 
-SmlDevInfSyncCap smlDevInfSyncCapConvert(unsigned int id, SmlError **error)
-{
-	smlTrace(TRACE_ENTRY, "%s(%u, %p)", __func__, id, error);
-	CHECK_ERROR_REF
-	SmlDevInfSyncCap result = SML_DEVINF_SYNCTYPE_UNKNOWN;
-
-	switch (id)
-	{
-		case SML_DEVINF_SYNCTYPE_TWO_WAY:
-			result = SML_DEVINF_SYNCTYPE_TWO_WAY;
-			break;
-		case SML_DEVINF_SYNCTYPE_SLOW_SYNC:
-			result = SML_DEVINF_SYNCTYPE_SLOW_SYNC;
-			break;
-		case SML_DEVINF_SYNCTYPE_ONE_WAY_FROM_CLIENT:
-			result = SML_DEVINF_SYNCTYPE_ONE_WAY_FROM_CLIENT;
-			break;
-		case SML_DEVINF_SYNCTYPE_REFRESH_FROM_CLIENT:
-			result = SML_DEVINF_SYNCTYPE_REFRESH_FROM_CLIENT;
-			break;
-		case SML_DEVINF_SYNCTYPE_ONE_WAY_FROM_SERVER:
-			result = SML_DEVINF_SYNCTYPE_ONE_WAY_FROM_SERVER;
-			break;
-		case SML_DEVINF_SYNCTYPE_REFRESH_FROM_SERVER:
-			result = SML_DEVINF_SYNCTYPE_REFRESH_FROM_SERVER;
-			break;
-		case SML_DEVINF_SYNCTYPE_SERVER_ALERTED_SYNC:
-			result = SML_DEVINF_SYNCTYPE_SERVER_ALERTED_SYNC;
-			break;
-		default:
-			smlErrorSet(error, SML_ERROR_GENERIC,
-				"The synchronization type %u is unknwon.", id);
-			smlTrace(TRACE_EXIT_ERROR, "%s - %s", __func__, smlErrorPrint(error));
-			return SML_DEVINF_SYNCTYPE_UNKNOWN;
-			break;
-	}
-	smlTrace(TRACE_EXIT, "%s - %u", __func__, result);
-	return result;
-}
-

Modified: trunk/libsyncml/sml_devinf_internals.h
==============================================================================
--- trunk/libsyncml/sml_devinf_internals.h	Mon Jun 29 12:19:28 2009	(r1126)
+++ trunk/libsyncml/sml_devinf_internals.h	Mon Jun 29 12:26:40 2009	(r1127)
@@ -30,7 +30,6 @@
 #ifndef _SML_DEVINF_INTERNALS_H_
 #define _SML_DEVINF_INTERNALS_H_
 
-SmlDevInfSyncCap smlDevInfSyncCapConvert(unsigned int id, SmlError **error);
 
 #endif //_SML_DEVINF_INTERNALS_H_