Menu
▾
▴
[Opensync-commits] r1129 - in trunk: libsyncml libsyncml/parser tests
|
From: <svn...@op...> - 2009-06-29 10:56:45
|
Author: bellmich Date: Mon Jun 29 12:56:37 2009 New Revision: 1129 URL: http://libsyncml.opensync.org/changeset/1129 Log: moved smlDevInfCTCapTypeFromString to SmlXmlParser Modified: trunk/libsyncml/parser/sml_xml_parse.c trunk/libsyncml/sml_devinf.c trunk/libsyncml/sml_devinf.h trunk/tests/check_devinf.c Modified: trunk/libsyncml/parser/sml_xml_parse.c ============================================================================== --- trunk/libsyncml/parser/sml_xml_parse.c Mon Jun 29 12:29:02 2009 (r1128) +++ trunk/libsyncml/parser/sml_xml_parse.c Mon Jun 29 12:56:37 2009 (r1129) @@ -1970,6 +1970,44 @@ return result; } +SmlDevInfCTCapType _smlParseDevInfCTCapType(const char *name, SmlError **error) +{ + CHECK_ERROR_REF + + if (!strcmp(name, SML_ELEMENT_CTTYPE)) { + return SML_DEVINF_CTCAP_CTTYPE; + } else if (!strcmp(name, SML_ELEMENT_PROPNAME)) { + return SML_DEVINF_CTCAP_PROPNAME; + } else if (!strcmp(name, SML_ELEMENT_VALENUM)) { + return SML_DEVINF_CTCAP_VALENUM; + } else if (!strcmp(name, SML_ELEMENT_DATATYPE)) { + return SML_DEVINF_CTCAP_DATATYPE; + } else if (!strcmp(name, SML_ELEMENT_SIZE)) { + return SML_DEVINF_CTCAP_SIZE; + } else if (!strcmp(name, SML_ELEMENT_DISPLAYNAME)) { + return SML_DEVINF_CTCAP_DISPLAYNAME; + } else if (!strcmp(name, SML_ELEMENT_PARAMNAME)) { + return SML_DEVINF_CTCAP_PARAMNAME; + } else if (!strcmp(name, SML_ELEMENT_VERCT)) { + return SML_DEVINF_CTCAP_VERCT; + } else if (!strcmp(name, SML_ELEMENT_PROPERTY)) { + return SML_DEVINF_CTCAP_PROPERTY; + } else if (!strcmp(name, SML_ELEMENT_PROPPARAM)) { + return SML_DEVINF_CTCAP_PROPPARAM; + } else if (!strcmp(name, SML_ELEMENT_NOTRUNCATE)) { + return SML_DEVINF_CTCAP_NOTRUNCATE; + } else if (!strcmp(name, SML_ELEMENT_MAXOCCUR)) { + return SML_DEVINF_CTCAP_MAXOCCUR; + } else if (!strcmp(name, SML_ELEMENT_MAXSIZE)) { + return SML_DEVINF_CTCAP_MAXSIZE; + } + + smlErrorSet(error, SML_ERROR_GENERIC, "Unknown ctcap type name \"%s\"", name); + smlTrace(TRACE_ERROR, "%s - %s", __func__, smlErrorPrint(error)); + return SML_DEVINF_CTCAP_UNKNOWN; +} + + /** @brief Start the parsing * * This will set everything up and parse until the SyncHdr @@ -2759,7 +2797,7 @@ /* determine list item type */ SmlDevInfCTCapType type; - type = smlDevInfCTCapTypeFromString(elem_name, error); + type = _smlParseDevInfCTCapType(elem_name, error); value = NULL; if (type != SML_DEVINF_CTCAP_UNKNOWN) { @@ -2972,7 +3010,7 @@ /* determine item type */ SmlDevInfCTCapType type; - type = smlDevInfCTCapTypeFromString(elem_name, error); + type = _smlParseDevInfCTCapType(elem_name, error); value = NULL; if (type != SML_DEVINF_CTCAP_UNKNOWN) { @@ -3061,7 +3099,7 @@ /* determine item type */ SmlDevInfCTCapType type; - type = smlDevInfCTCapTypeFromString(elem_name, error); + type = _smlParseDevInfCTCapType(elem_name, error); value = NULL; if (type != SML_DEVINF_CTCAP_UNKNOWN && type != SML_DEVINF_CTCAP_PROPPARAM) @@ -3187,7 +3225,7 @@ /* determine item type */ SmlDevInfCTCapType type; - type = smlDevInfCTCapTypeFromString(elem_name, error); + type = _smlParseDevInfCTCapType(elem_name, error); value = NULL; if (type != SML_DEVINF_CTCAP_UNKNOWN && type != SML_DEVINF_CTCAP_PROPERTY) Modified: trunk/libsyncml/sml_devinf.c ============================================================================== --- trunk/libsyncml/sml_devinf.c Mon Jun 29 12:29:02 2009 (r1128) +++ trunk/libsyncml/sml_devinf.c Mon Jun 29 12:56:37 2009 (r1129) @@ -228,41 +228,3 @@ return NULL; } -SmlDevInfCTCapType smlDevInfCTCapTypeFromString(const char *name, SmlError **error) -{ - CHECK_ERROR_REF - - if (!strcmp(name, SML_ELEMENT_CTTYPE)) { - return SML_DEVINF_CTCAP_CTTYPE; - } else if (!strcmp(name, SML_ELEMENT_PROPNAME)) { - return SML_DEVINF_CTCAP_PROPNAME; - } else if (!strcmp(name, SML_ELEMENT_VALENUM)) { - return SML_DEVINF_CTCAP_VALENUM; - } else if (!strcmp(name, SML_ELEMENT_DATATYPE)) { - return SML_DEVINF_CTCAP_DATATYPE; - } else if (!strcmp(name, SML_ELEMENT_SIZE)) { - return SML_DEVINF_CTCAP_SIZE; - } else if (!strcmp(name, SML_ELEMENT_DISPLAYNAME)) { - return SML_DEVINF_CTCAP_DISPLAYNAME; - } else if (!strcmp(name, SML_ELEMENT_PARAMNAME)) { - return SML_DEVINF_CTCAP_PARAMNAME; - } else if (!strcmp(name, SML_ELEMENT_VERCT)) { - return SML_DEVINF_CTCAP_VERCT; - } else if (!strcmp(name, SML_ELEMENT_PROPERTY)) { - return SML_DEVINF_CTCAP_PROPERTY; - } else if (!strcmp(name, SML_ELEMENT_PROPPARAM)) { - return SML_DEVINF_CTCAP_PROPPARAM; - } else if (!strcmp(name, SML_ELEMENT_NOTRUNCATE)) { - return SML_DEVINF_CTCAP_NOTRUNCATE; - } else if (!strcmp(name, SML_ELEMENT_MAXOCCUR)) { - return SML_DEVINF_CTCAP_MAXOCCUR; - } else if (!strcmp(name, SML_ELEMENT_MAXSIZE)) { - return SML_DEVINF_CTCAP_MAXSIZE; - } - - smlErrorSet(error, SML_ERROR_GENERIC, "Unknown ctcap type name \"%s\"", name); - smlTrace(TRACE_ERROR, "%s - %s", __func__, smlErrorPrint(error)); - return SML_DEVINF_CTCAP_UNKNOWN; -} - - Modified: trunk/libsyncml/sml_devinf.h ============================================================================== --- trunk/libsyncml/sml_devinf.h Mon Jun 29 12:29:02 2009 (r1128) +++ trunk/libsyncml/sml_devinf.h Mon Jun 29 12:56:37 2009 (r1129) @@ -47,8 +47,6 @@ SmlDevInf *smlDevInfParse(const char *data, unsigned int length, SmlError **error); SmlDevInf *smlDevInfFromResult(SmlCommand *result, SmlError **error); -SmlDevInfCTCapType smlDevInfCTCapTypeFromString(const char *name, SmlError **error); - #endif //_SML_DEVINF_H_ /*@}*/ Modified: trunk/tests/check_devinf.c ============================================================================== --- trunk/tests/check_devinf.c Mon Jun 29 12:29:02 2009 (r1128) +++ trunk/tests/check_devinf.c Mon Jun 29 12:56:37 2009 (r1129) @@ -401,11 +401,11 @@ SmlDevInfCTCapType type; /* SyncML 1.1 */ - type = smlDevInfCTCapTypeFromString(SML_ELEMENT_SIZE, &error); + type = _smlParseDevInfCTCapType(SML_ELEMENT_SIZE, &error); sml_fail_unless(type == SML_DEVINF_CTCAP_SIZE, NULL); /* SyncML 1.1 and 1.2 */ - type = smlDevInfCTCapTypeFromString(SML_ELEMENT_MAXSIZE, &error); + type = _smlParseDevInfCTCapType(SML_ELEMENT_MAXSIZE, &error); sml_fail_unless(type == SML_DEVINF_CTCAP_MAXSIZE, NULL); } END_TEST |
