Changeset 124

Timestamp:

04/12/06 22:19:21 (3 years ago)

Author:

abauer

Message:

Updated the wbxml patch to fix another problem

Files:

• branches/development-branch/misc/wbxml2-0.9.0.patch (modified) (1 diff)

branches/development-branch/misc/wbxml2-0.9.0.patch

@@ -95 +95 @@
-     return parse_element(parser);
- }
+diff -u wbxml2-0.9.0/src/wbxml_tree.c ../wbxml2-0.9.0/src/wbxml_tree.c
+--- wbxml2-0.9.0/src/wbxml_tree.c       2004-02-25 18:57:14.000000000 +0100
++++ ../wbxml2-0.9.0/src//wbxml_tree.c   2006-04-12 11:37:32.000000000 +0200
+@@ -296,6 +296,7 @@
+ WBXML_DECLARE(WBXMLSyncMLDataType) wbxml_tree_node_get_syncml_data_type(WBXMLTreeNode *node)
+ {
+     WBXMLTreeNode *tmp_node = NULL;
++    WBXMLTreeNode *meta_tmp_node = NULL;
+ 
+     if (node == NULL)
+         return WBXML_SYNCML_DATA_TYPE_NORMAL;
+@@ -306,18 +307,14 @@
+         (WBXML_STRCMP(wbxml_tag_get_xml_name(node->name), "Data") == 0))
+     {
+         /* Go to Parent element (or Parent of Parent) and search for <Meta> */
+-        if (((node->parent != NULL) && 
+-             (node->parent->children != NULL) && 
+-             ((tmp_node = wbxml_tree_node_elt_get_from_name(node->parent->children, "Meta", FALSE)) != NULL)) ||
+-            ((node->parent != NULL) && 
+-             (node->parent->parent != NULL) && 
+-             (node->parent->parent->children != NULL) && 
+-             ((tmp_node = wbxml_tree_node_elt_get_from_name(node->parent->parent->children, "Meta", FALSE)) != NULL))) 
++        if ((node->parent != NULL && node->parent->children != NULL && 
++               (((meta_tmp_node = wbxml_tree_node_elt_get_from_name(node->parent->children, "Meta", FALSE)) != NULL &&
++               (tmp_node = wbxml_tree_node_elt_get_from_name(meta_tmp_node->children, "Type", FALSE)) != NULL) ||
++               (node->parent != NULL && node->parent->parent != NULL && node->parent->parent->children != NULL && 
++               (meta_tmp_node = wbxml_tree_node_elt_get_from_name(node->parent->parent->children, "Meta", FALSE)) != NULL &&
++               (tmp_node = wbxml_tree_node_elt_get_from_name(meta_tmp_node->children, "Type", FALSE)) != NULL))))
+         {
+-            /* Search for <Type> */
+-            if ((tmp_node = wbxml_tree_node_elt_get_from_name(tmp_node->children, "Type", FALSE)) != NULL) 
+-            {
+-                /* Check <Type> value */
++               /* Check <Type> value */
+                 if ((tmp_node->children != NULL) && (tmp_node->children->type == WBXML_TREE_TEXT_NODE)) {
+                     /* application/vnd.syncml-devinf+wbxml */
+                     if (wbxml_buffer_compare_cstr(tmp_node->children->content, "application/vnd.syncml-devinf+wbxml") == 0) {
+@@ -344,7 +341,6 @@
+                                            return WBXML_SYNCML_DATA_TYPE_VCALENDAR;
+                                        }
+                 }
+-            }
+         }
+     }
+