Ticket #121: syncml12.patch

Doxyfile.in

@@ -432 +432 @@
-# should be searched for input files as well. Possible values are YES and NO. 
-# If left blank NO is used.
-
-NO
+YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should 
-# excluded from the INPUT source files. This way you can easily exclude a 

libsyncml/objects/sml_devinf_obj.c

@@ -97 +97 @@
-                if (get) {
-                        if (smlSessionGetVersion(session) == SML_VERSION_10)
-                                result = smlDevInfNewResult(get, agent->devinf, SML_DEVINF_VERSION_10, error);
+                        else if (smlSessionGetVersion(session) == SML_VERSION_12)
+                                result = smlDevInfNewResult(get, agent->devinf, SML_DEVINF_VERSION_12, error);
-                        else
-                                result = smlDevInfNewResult(get, agent->devinf, SML_DEVINF_VERSION_11, error);
-                        
@@ -123 +125 @@
-                } else {
-                        if (smlSessionGetVersion(session) == SML_VERSION_10)
-                                cmd = smlDevInfNewPut(agent->devinf, SML_DEVINF_VERSION_10, error);
+                        else if (smlSessionGetVersion(session) == SML_VERSION_12)
+                                cmd = smlDevInfNewPut(agent->devinf, SML_DEVINF_VERSION_12, error);
-                        else
-                                cmd = smlDevInfNewPut(agent->devinf, SML_DEVINF_VERSION_11, error);
-                        
@@ -281 +285 @@
-        
-        if (smlSessionGetVersion(session) == SML_VERSION_10)
-                get = smlDevInfNewGet(SML_DEVINF_VERSION_10, error);
+        else if (smlSessionGetVersion(session) == SML_VERSION_12)
+                get = smlDevInfNewGet(SML_DEVINF_VERSION_12, error);
-        else
-                get = smlDevInfNewGet(SML_DEVINF_VERSION_11, error);
-        
@@ -308 +314 @@
-        smlAssert(agent);
-        smlAssert(manager);
-
+        SmlLocation *devinf12 = smlLocationNew("./devinf12", NULL, error);
-        SmlLocation *devinf11 = smlLocationNew("./devinf11", NULL, error);
-        SmlLocation *devinf10 = smlLocationNew("./devinf10", NULL, error);
-
-
+2 || !devinf1
-                goto error;
-
-        if (!smlManagerObjectRegister(manager, SML_COMMAND_TYPE_PUT, session, NULL, devinf10, NULL, _recv_devinf, NULL, agent, error))
-                goto error_free_loc;
-        if (!smlManagerObjectRegister(manager, SML_COMMAND_TYPE_PUT, session, NULL, devinf11, NULL, _recv_devinf, NULL, agent, error))
-                goto error_free_loc;
+        if (!smlManagerObjectRegister(manager, SML_COMMAND_TYPE_PUT, session, NULL, devinf12, NULL, _recv_devinf, NULL, agent, error))
+                goto error_free_loc;
-
-        if (!smlManagerObjectRegister(manager, SML_COMMAND_TYPE_GET, session, devinf10, NULL, NULL, _request_devinf, NULL, agent, error))
-                goto error_free_loc;
-        if (!smlManagerObjectRegister(manager, SML_COMMAND_TYPE_GET, session, devinf11, NULL, NULL, _request_devinf, NULL, agent, error))
-                goto error_free_loc;
+        if (!smlManagerObjectRegister(manager, SML_COMMAND_TYPE_GET, session, devinf12, NULL, NULL, _request_devinf, NULL, agent, error))
+                goto error_free_loc;
-
-        smlLocationUnref(devinf10);
-        smlLocationUnref(devinf11);
+        smlLocationUnref(devinf12);
-
-        smlTrace(TRACE_EXIT, "%s", __func__);
-        return TRUE;
@@ -335 +347 @@
-                smlLocationUnref(devinf10);
-        if (devinf11)
-                smlLocationUnref(devinf11);
+        if (devinf12)
+                smlLocationUnref(devinf11);
-error:
-        smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(error));
-        return FALSE;

libsyncml/sml_devinf.c

@@ -554 +554 @@
-        
-        if (version == SML_DEVINF_VERSION_10)
-                source = smlLocationNew("./devinf10", NULL, error);
+        else if (version == SML_DEVINF_VERSION_12)
+                source = smlLocationNew("./devinf12", NULL, error);
-        else
-                source = smlLocationNew("./devinf11", NULL, error);
-                
@@ -588 +590 @@
-        
-        if (version == SML_DEVINF_VERSION_10)
-                source = smlLocationNew("./devinf10", NULL, error);
+        else if (version == SML_DEVINF_VERSION_12)
+                source = smlLocationNew("./devinf12", NULL, error);
-        else
-                source = smlLocationNew("./devinf11", NULL, error);
-                
@@ -630 +634 @@
-        
-        if (version == SML_DEVINF_VERSION_10)
-                target = smlLocationNew("./devinf10", NULL, error);
+        else if (version == SML_DEVINF_VERSION_12)
+                target = smlLocationNew("./devinf12", NULL, error);
-        else
-                target = smlLocationNew("./devinf11", NULL, error);
-                

libsyncml/parser/sml_xml_assm.c

@@ -1871 +1871 @@
-        
-        //Verdtd
-        switch (version) {
+                case SML_DEVINF_VERSION_12:
+                        if (!_smlXmlAssemblerAddString(assm, SML_ELEMENT_VERDTD, "1.2", error))
+                                goto error_free_writer;
+                        break;
-                case SML_DEVINF_VERSION_11:
-                        if (!_smlXmlAssemblerAddString(assm, SML_ELEMENT_VERDTD, "1.1", error))
-                                goto error_free_writer;

libsyncml/parser/sml_xml_parse.c

@@ -2103 +2103 @@
-        return FALSE;
-}
-
+static SmlBool _smlXmlDevInfDataStoreParseCTCap(SmlXmlParser *parser, SmlDevInf *devinf, SmlError **error)
+{
+        smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, parser, devinf, error);
+        smlAssert(parser);
+        smlAssert(devinf);
+        
+        if (!_smlXmlParserStep(parser)) {
+                smlErrorSet(error, SML_ERROR_GENERIC, "Missing nodes");
+                goto error;
+        }
+        
+        while (1) {
+                smlTrace(TRACE_INTERNAL, "read: %s\n",(char *)xmlTextReaderConstName(parser->reader));
+                if (!strcmp((char *)xmlTextReaderConstName(parser->reader), SML_ELEMENT_CTCAP) &&
+                        xmlTextReaderNodeType(parser->reader) == XML_NODE_CLOSE) {
+                        break;
+                } else if (xmlTextReaderNodeType(parser->reader) != XML_NODE_START) {
+                        smlErrorSet(error, SML_ERROR_GENERIC, "Not a start node: %s", (char *)xmlTextReaderConstName(parser->reader));
+                        goto error;
+                }
+                
+                const char *elem_name;
+                char *value = NULL;
+                SmlDevInfCTCapType type;
+                
+                elem_name = (const char*)xmlTextReaderConstName(parser->reader);
+                type = smlDevInfCTCapTypeFromString(elem_name, NULL);
+                if (type != SML_DEVINF_CTCAP_UNKNOWN) {
+                        _smlXmlParserGetString(parser, &value, elem_name, error);
+                        smlDevInfAddCTCap(devinf, type, value);
+                        g_free(value);
+                }
+        
+                if (!_smlXmlParserStep(parser)) {
+                        smlErrorSet(error, SML_ERROR_GENERIC, "Missing nodes");
+                        goto error;
+                }
+        }
+        
+        smlTrace(TRACE_EXIT, "%s", __func__);
+        return TRUE;
+
+error:
+        smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(error));
+        return FALSE;
+}
+
-static SmlBool _smlXmlDevInfDataStoreParseRxTx(SmlXmlParser *parser, const char *element, char **cttype, char **version, SmlError **error)
-{
-        smlTrace(TRACE_ENTRY, "%s(%p, %s, %p, %p, %p)", __func__, parser, element, cttype, version, error);
@@ -2213 +2260 @@
-                } else if (!strcmp((char *)xmlTextReaderConstName(parser->reader), SML_ELEMENT_TX)) {
-                        if (!_smlXmlDevInfDataStoreParseRxTx(parser, SML_ELEMENT_TX, &(datastore->txContentType), &(datastore->txVersion), error))
-                                goto error_free_datastore;
+                } else if (!strcmp((char *)xmlTextReaderConstName(parser->reader), SML_ELEMENT_CTCAP)) {
+                        if (!_smlXmlDevInfDataStoreParseCTCap(parser, devinf, error))
+                                goto error_free_datastore;
-                } else if (!strcmp((char *)xmlTextReaderConstName(parser->reader), SML_ELEMENT_SYNCCAP)) {
-                        if (!_smlXmlDevInfDataStoreParseSyncCap(parser, datastore, error))
-                                goto error_free_datastore;
@@ -2299 +2349 @@
-                                devinf->version = SML_DEVINF_VERSION_11;
-                        else if (verdtd && !strcmp(verdtd, "1.0"))
-                                devinf->version = SML_DEVINF_VERSION_10;
+                        else if (verdtd && !strcmp(verdtd, "1.2"))
+                                devinf->version = SML_DEVINF_VERSION_12;
-                        else {
-                                g_free(verdtd);
-                                smlErrorSet(error, SML_ERROR_GENERIC, "Unknown devinf version");
@@ -2400 +2452 @@
-                        if (!_smlXmlDevInfDataStoreParse(parser, devinf, error))
-                                goto error_free_devinf;
-                } else if (!strcmp((char *)xmlTextReaderConstName(parser->reader), SML_ELEMENT_CTCAP)) {
-
-
+
-                                goto error_free_devinf;
-                        }
-                        
-                        while (1) {
-                                if (!strcmp((char *)xmlTextReaderConstName(parser->reader), SML_ELEMENT_CTCAP) &&
-                                    xmlTextReaderNodeType(parser->reader) == XML_NODE_CLOSE) {
-                                        break;
-                                } else if (xmlTextReaderNodeType(parser->reader) != XML_NODE_START) {
-                                        smlErrorSet(error, SML_ERROR_GENERIC, "Not a start node");
-                                        goto error_free_devinf;
-                                }
-                                
-                                const char *elem_name;
-                                char *value = NULL;
-                                SmlDevInfCTCapType type;
-                                
-                                elem_name = (const char*)xmlTextReaderConstName(parser->reader);
-                                type = smlDevInfCTCapTypeFromString(elem_name, NULL);
-                                if (type != SML_DEVINF_CTCAP_UNKNOWN) {
-                                        _smlXmlParserGetString(parser, &value, elem_name, error);
-                                        smlDevInfAddCTCap(devinf, type, value);
-                                        g_free(value);
-                                }
-
-                                if (!_smlXmlParserStep(parser)) {
-                                        smlErrorSet(error, SML_ERROR_GENERIC, "Missing nodes");
-                                        goto error_free_devinf;
-                                }
-                        }
-                } else if (!strcmp((char *)xmlTextReaderConstName(parser->reader), SML_ELEMENT_EXT)) {
-                        /* Ignored for now */
-                        smlTrace(TRACE_INTERNAL, "Skipping ext node");

libsyncml/sml_defines.h

@@ -198 +198 @@
-typedef enum  {
-        SML_DEVINF_VERSION_UNKNOWN = 0,
-        SML_DEVINF_VERSION_10 = 1,
-
+
+
-} SmlDevInfVersion;
-
-typedef enum {