SOURCES: wbxml2-r34.patch (NEW), wbxml2-r35.patch (NEW), wbxml2-r39.patch (...
sls
sls at pld-linux.org
Wed Oct 22 19:47:52 CEST 2008
Author: sls Date: Wed Oct 22 17:47:52 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- changesets from wbxml repository (http://libwbxml.aymerick.com/changeset/NN)
---- Files affected:
SOURCES:
wbxml2-r34.patch (NONE -> 1.1) (NEW), wbxml2-r35.patch (NONE -> 1.1) (NEW), wbxml2-r39.patch (NONE -> 1.1) (NEW), wbxml2-r41.patch (NONE -> 1.1) (NEW), wbxml2-r42.patch (NONE -> 1.1) (NEW), wbxml2-r43.patch (NONE -> 1.1) (NEW), wbxml2-r44.patch (NONE -> 1.1) (NEW), wbxml2-r48.patch (NONE -> 1.1) (NEW), wbxml2-r49.patch (NONE -> 1.1) (NEW), wbxml2-r52.patch (NONE -> 1.1) (NEW), wbxml2-r57.patch (NONE -> 1.1) (NEW), wbxml2-r58.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/wbxml2-r34.patch
diff -u /dev/null SOURCES/wbxml2-r34.patch:1.1
--- /dev/null Wed Oct 22 19:47:53 2008
+++ SOURCES/wbxml2-r34.patch Wed Oct 22 19:47:41 2008
@@ -0,0 +1,22 @@
+Index: /wbxml2/trunk/src/wbxml_encoder.c
+===================================================================
+--- /wbxml2/trunk/src/wbxml_encoder.c (revision 13)
++++ /wbxml2/trunk/src/wbxml_encoder.c (revision 34)
+@@ -638,4 +638,8 @@
+ WBXML_DECLARE(WBXMLError) wbxml_encoder_encode_node(WBXMLEncoder *encoder, WBXMLTreeNode *node)
+ {
++ if (encoder->flow_mode == FALSE) {
++ WBXML_WARNING((WBXML_ENCODER, "You should NOT call wbxml_encoder_encode_node() if you are not in Flow Mode encoding ! (use wbxml_encoder_set_flow_mode(encoder, TRUE))"));
++ }
++
+ return wbxml_encoder_encode_node_with_elt_end(encoder, node, TRUE);
+ }
+@@ -649,8 +653,4 @@
+ if ((encoder == NULL) || (node == NULL))
+ return WBXML_ERROR_BAD_PARAMETER;
+-
+- if (encoder->flow_mode == FALSE) {
+- WBXML_WARNING((WBXML_ENCODER, "You should NOT call wbxml_encoder_encode_node() if you are not in Flow Mode encoding ! (use wbxml_encoder_set_flow_mode(encoder, TRUE))"));
+- }
+
+ /* Check that language table has been set */
================================================================
Index: SOURCES/wbxml2-r35.patch
diff -u /dev/null SOURCES/wbxml2-r35.patch:1.1
--- /dev/null Wed Oct 22 19:47:53 2008
+++ SOURCES/wbxml2-r35.patch Wed Oct 22 19:47:41 2008
@@ -0,0 +1,247 @@
+Index: /wbxml2/trunk/src/wbxml_tree.c
+===================================================================
+--- /wbxml2/trunk/src/wbxml_tree.c (revision 15)
++++ /wbxml2/trunk/src/wbxml_tree.c (revision 35)
+@@ -615,4 +615,38 @@
+
+ return TRUE;
++}
++
++
++WBXML_DECLARE(WBXMLError) wbxml_tree_node_extract(WBXMLTreeNode *node)
++{
++ if (node == NULL)
++ return WBXML_ERROR_BAD_PARAMETER;
++
++ /* Parent link */
++ if (node->parent != NULL) {
++ if (node->parent->children == node) {
++ /* Update parent children */
++ node->parent->children = node->next;
++ }
++
++ /* No more parent */
++ node->parent = NULL;
++ }
++
++ /* Next link */
++ if (node->next != NULL) {
++ /* Link next node to previous node */
++ node->next->prev = node->prev;
++ node->next = NULL;
++ }
++
++ /* Previous link */
++ if (node->prev != NULL) {
++ /* Link previous node to next node */
++ node->prev->next = node->next;
++ node->prev = NULL;
++ }
++
++ return WBXML_OK;
+ }
+
+@@ -911,4 +945,6 @@
+
+
++/* Tree functions */
++
+ WBXML_DECLARE(WBXMLTree *) wbxml_tree_create(WBXMLLanguage lang,
+ WBXMLCharsetMIBEnum orig_charset)
+@@ -939,5 +975,4 @@
+
+
+-/** @todo Rewrite this function (use wbxml_tree_node_* functions) */
+ WBXML_DECLARE(WB_BOOL) wbxml_tree_add_node(WBXMLTree *tree, WBXMLTreeNode *parent, WBXMLTreeNode *node)
+ {
+@@ -946,25 +981,9 @@
+ if ((tree == NULL) || (node == NULL))
+ return FALSE;
+-
+- /* Set parent to new node */
+- node->parent = parent;
+-
++
+ /* Check if this is the Root Element */
+ if (parent != NULL) {
+- /* This is not the Root Element... search for previous sibbling element */
+- if (parent->children != NULL) {
+- /* Add this Node to end of Sibbling Node list of Parent */
+- tmp = parent->children;
+-
+- while (tmp->next != NULL)
+- tmp = tmp->next;
+-
+- node->prev = tmp;
+- tmp->next = node;
+- }
+- else {
+- /* No previous sibbling element */
+- parent->children = node;
+- }
++ if (!wbxml_tree_node_add_child(parent, node))
++ return FALSE;
+ }
+ else {
+@@ -975,4 +994,5 @@
+ /* This is the Root Element */
+ tree->root = node;
++ node->parent = NULL;
+ }
+
+@@ -981,5 +1001,4 @@
+
+
+-/** @todo Rewrite this function (use wbxml_tree_node_* functions) */
+ WBXML_DECLARE(WBXMLError) wbxml_tree_extract_node(WBXMLTree *tree,
+ WBXMLTreeNode *node)
+@@ -987,39 +1006,14 @@
+ if ((tree == NULL) || (node == NULL))
+ return WBXML_ERROR_BAD_PARAMETER;
+-
+- /* Parent link */
+- if (node->parent != NULL) {
+- if (node->parent->children == node) {
+- /* Update parent children */
+- node->parent->children = node->next;
+- }
+-
+- /* No more parent */
+- node->parent = NULL;
+- }
+- else {
++
++ if (node == tree->root) {
+ /* Root removed ! */
+ tree->root = node->next;
+ }
+
+- /* Next link */
+- if (node->next != NULL) {
+- /* Link next node to previous node */
+- node->next->prev = node->prev;
+- node->next = NULL;
+- }
+-
+- /* Previous link */
+- if (node->prev != NULL) {
+- /* Link previous node to next node */
+- node->prev->next = node->next;
+- node->prev = NULL;
+- }
+-
+- return WBXML_OK;
+-}
+-
+-
+-/** @todo Rewrite this function (use wbxml_tree_node_* functions) */
++ return wbxml_tree_node_extract(node);
++}
++
++
+ WBXML_DECLARE(WBXMLTreeNode *) wbxml_tree_add_elt(WBXMLTree *tree,
+ WBXMLTreeNode *parent,
+@@ -1049,5 +1043,4 @@
+
+
+-/** @todo Rewrite this function (use wbxml_tree_node_* functions) */
+ WBXML_DECLARE(WBXMLTreeNode *) wbxml_tree_add_elt_with_attrs(WBXMLTree *tree,
+ WBXMLTreeNode *parent,
+@@ -1076,34 +1069,13 @@
+
+
+-/** @todo Rewrite this function (use wbxml_tree_node_* functions) */
+ WBXML_DECLARE(WBXMLTreeNode *) wbxml_tree_add_xml_elt(WBXMLTree *tree,
+ WBXMLTreeNode *parent,
+ WB_UTINY *name)
+ {
+- const WBXMLTagEntry *tag_entry = NULL;
+ WBXMLTreeNode *node = NULL;
+- WBXMLTag *tag = NULL;
+-
+- /* Search for XML Tag Name in Table */
+- if ((tag_entry = wbxml_tables_get_tag_from_xml(tree->lang, (const WB_UTINY *) name)) != NULL) {
+- /* Found : token tag */
+- tag = wbxml_tag_create_token(tag_entry);
+- }
+- else {
+- /* Not found : literal tag */
+- tag = wbxml_tag_create_literal(name);
+- }
+-
+- if (tag == NULL)
+- return NULL;
+-
+- /* Create a new Node */
+- if ((node = wbxml_tree_node_create(WBXML_TREE_ELEMENT_NODE)) == NULL) {
+- wbxml_tag_destroy(tag);
+- return NULL;
+- }
+-
+- /* Set Node Tag */
+- node->name = tag;
++
++ /* Create element node */
++ if ((node = wbxml_tree_node_create_xml_elt(tree->lang, (const WB_UTINY *) name)) == NULL)
++ return NULL;
+
+ /* Add this Node to Tree */
+@@ -1117,5 +1089,4 @@
+
+
+-/** @todo Rewrite this function (use wbxml_tree_node_* functions) */
+ WBXML_DECLARE(WBXMLTreeNode *) wbxml_tree_add_xml_elt_with_attrs(WBXMLTree *tree,
+ WBXMLTreeNode *parent,
+@@ -1144,5 +1115,4 @@
+
+
+-/** @todo Rewrite this function (use wbxml_tree_node_* functions) */
+ WBXML_DECLARE(WBXMLTreeNode *) wbxml_tree_add_text(WBXMLTree *tree,
+ WBXMLTreeNode *parent,
+@@ -1153,11 +1123,5 @@
+
+ /* Create a new Node */
+- if ((node = wbxml_tree_node_create(WBXML_TREE_TEXT_NODE)) == NULL) {
+- return NULL;
+- }
+-
+- /* Set Content */
+- if ((node->content = wbxml_buffer_create(text, len, len)) == NULL) {
+- wbxml_tree_node_destroy(node);
++ if ((node = wbxml_tree_node_create_text(text, len)) == NULL) {
+ return NULL;
+ }
+@@ -1173,5 +1137,4 @@
+
+
+-/** @todo Rewrite this function (use wbxml_tree_node_* functions) */
+ WBXML_DECLARE(WBXMLTreeNode *) wbxml_tree_add_cdata(WBXMLTree *tree,
+ WBXMLTreeNode *parent)
+@@ -1197,5 +1160,4 @@
+
+
+-/** @todo Rewrite this function (use wbxml_tree_node_* functions) */
+ WBXML_DECLARE(WBXMLTreeNode *) wbxml_tree_add_tree(WBXMLTree *tree,
+ WBXMLTreeNode *parent,
+@@ -1222,5 +1184,4 @@
+
+
+-/** @todo Rewrite this function (use wbxml_tree_node_* functions) */
+ WBXML_DECLARE(WBXMLTreeNode *) wbxml_tree_add_xml_elt_with_attrs_and_text(WBXMLTree *tree,
+ WBXMLTreeNode *parent,
+Index: /wbxml2/trunk/src/wbxml_tree.h
+===================================================================
+--- /wbxml2/trunk/src/wbxml_tree.h (revision 15)
++++ /wbxml2/trunk/src/wbxml_tree.h (revision 35)
+@@ -310,4 +310,11 @@
+
+ /**
++ * @brief Extract a node
++ * @param node Node to extract
++ * @return TRUE if extracted or FALSE if error
++ */
++WBXML_DECLARE(WBXMLError) wbxml_tree_node_extract(WBXMLTreeNode *node);
++
++/**
+ * @brief Add a WBXML Attribute to a Tree Node structure
+ * @param node The Tree Node to modify
================================================================
Index: SOURCES/wbxml2-r39.patch
diff -u /dev/null SOURCES/wbxml2-r39.patch:1.1
--- /dev/null Wed Oct 22 19:47:54 2008
+++ SOURCES/wbxml2-r39.patch Wed Oct 22 19:47:42 2008
@@ -0,0 +1,94 @@
+Index: /wbxml2/trunk/src/wbxml_tree.h
+===================================================================
+--- /wbxml2/trunk/src/wbxml_tree.h (revision 35)
++++ /wbxml2/trunk/src/wbxml_tree.h (revision 39)
+@@ -181,8 +181,8 @@
+ /**
+ * @brief Convert a WBXML Tree to an XML document
+- * @param tree [in] The WBXML Tree to convert
+- * @param wbxml [out] The resulting XML document
+- * @param wbxml_len [out] The resulting XML document length
+- * @param params [in] Parameters (if NULL, default values are used)
++ * @param tree [in] The WBXML Tree to convert
++ * @param xml [out] The resulting XML document
++ * @param xml_len [out] The resulting XML document length
++ * @param params [in] Parameters (if NULL, default values are used)
+ * @result Return WBXML_OK if no error, an error code otherwise
+ */
+@@ -238,5 +238,5 @@
+ /**
+ * @brief Destroy a Tree Node structure (used for wbxml_list_destroy())
+- * @paramnode The Tree Node structure to destroy
++ * @param node The Tree Node structure to destroy
+ */
+ WBXML_DECLARE(void) wbxml_tree_node_destroy_item(void *node);
+Index: /wbxml2/trunk/src/wbxml_charset.h
+===================================================================
+--- /wbxml2/trunk/src/wbxml_charset.h (revision 5)
++++ /wbxml2/trunk/src/wbxml_charset.h (revision 39)
+@@ -98,5 +98,5 @@
+ * @param in_buf Buffer to convert
+ * @param io_bytes Number of bytes in buffer
+- * @param in_charser Original charset
++ * @param in_charset Original charset
+ * @param out_buf Resulting converted Buffer
+ * @param out_charset Destination charset
+@@ -124,5 +124,5 @@
+ * @param in_buf Buffer to convert
+ * @param io_bytes Number of bytes in buffer
+- * @param in_charser Original charset
++ * @param in_charset Original charset
+ * @param out_buf Resulting converted Buffer
+ * @param out_charset Destination charset
+Index: /wbxml2/trunk/src/wbxml_encoder.c
+===================================================================
+--- /wbxml2/trunk/src/wbxml_encoder.c (revision 34)
++++ /wbxml2/trunk/src/wbxml_encoder.c (revision 39)
+@@ -103,6 +103,6 @@
+
+ /**
+- * If defined, generate empty XML elements (eg: <foo />), else generate
+- * full "end element" (eg: <foo></foo>)
++ * If defined, generate empty XML elements (eg: <foo />), else generate
++ * full "end element" (eg: <foo></foo>)
+ *
+ * @todo This must be a 'WBXMLGenXMLParams' parameter
+@@ -111,8 +111,8 @@
+
+ /**
+- * If defined, do not indent elements that have no element child (eg: <foo>bar</foo>),
+- * else indent anyway (eg: <foo>
++ * If defined, do not indent elements that have no element child (eg: <foo>bar</foo>),
++ * else indent anyway (eg: <foo>
+ * bar
+- * </foo>)
++ * </foo>)
+ *
+ * @todo This must be a 'WBXMLGenXMLParams' parameter
+Index: /wbxml2/trunk/src/wbxml_encoder.h
+===================================================================
+--- /wbxml2/trunk/src/wbxml_encoder.h (revision 7)
++++ /wbxml2/trunk/src/wbxml_encoder.h (revision 39)
+@@ -192,5 +192,5 @@
+ * You should use this function (with TRUE parameter) before calling wbxml_encoder_encode_node().
+ *
+- * @param encode [in] The WBXML Encoder to use
++ * @param encoder [in] The WBXML Encoder to use
+ * @param flow_mode [in] Set Flow Mode ?
+ * @return Return WBXML_OK if no error, an error code otherwise
+@@ -227,6 +227,6 @@
+ * You must call wbxml_encoder_set_lang() before using this function.
+ *
+- * @param encode [in] The WBXML Encoder to use
+- * @param node [in] The WBXML Tree Node to encode
++ * @param encoder [in] The WBXML Encoder to use
++ * @param node [in] The WBXML Tree Node to encode
+ * @return Return WBXML_OK if no error, an error code otherwise
+ */
+@@ -237,5 +237,5 @@
+ *
+ * @param encoder [in] The WBXML Encoder to use
+- * @param tree [in] The WBXML Tree to encode
++ * @param node [in] The WBXML Tree Node to encode
+ * @param enc_end [in] Encoded element 'end' ?
+ * @return Return WBXML_OK if no error, an error code otherwise
================================================================
Index: SOURCES/wbxml2-r41.patch
diff -u /dev/null SOURCES/wbxml2-r41.patch:1.1
--- /dev/null Wed Oct 22 19:47:55 2008
+++ SOURCES/wbxml2-r41.patch Wed Oct 22 19:47:42 2008
@@ -0,0 +1,33 @@
+Index: /wbxml2/trunk/src/wbxml_tables.h
+===================================================================
+--- /wbxml2/trunk/src/wbxml_tables.h (revision 27)
++++ /wbxml2/trunk/src/wbxml_tables.h (revision 41)
+@@ -109,6 +109,6 @@
+ /* SyncML 1.2 */
+ #define WBXML_PUBLIC_ID_SYNCML_SYNCML12 0x1201
+-#define WBXML_PUBLIC_ID_SYNCML_DEVINF12 0x1202
+-#define WBXML_PUBLIC_ID_SYNCML_METINF12 0x1203
++#define WBXML_PUBLIC_ID_SYNCML_METINF12 0x1202
++#define WBXML_PUBLIC_ID_SYNCML_DEVINF12 0x1203
+
+ #define XML_PUBLIC_ID_SYNCML_SYNCML12 "-//SYNCML//DTD SyncML 1.2//EN"
+Index: /wbxml2/trunk/src/wbxml_encoder.c
+===================================================================
+--- /wbxml2/trunk/src/wbxml_encoder.c (revision 39)
++++ /wbxml2/trunk/src/wbxml_encoder.c (revision 41)
+@@ -1937,5 +1937,6 @@
+ /* If this is a SyncML document ? */
+ if ((encoder->lang->langID == WBXML_LANG_SYNCML_SYNCML10) ||
+- (encoder->lang->langID == WBXML_LANG_SYNCML_SYNCML11))
++ (encoder->lang->langID == WBXML_LANG_SYNCML_SYNCML11) ||
++ (encoder->lang->langID == WBXML_LANG_SYNCML_SYNCML12))
+ {
+ /** @todo We must check too if we are in a <Type> */
+@@ -4020,5 +4021,6 @@
+ /* Change text in <Type> from "application/vnd.syncml-devinf+wbxml" to "application/vnd.syncml-devinf+xml" */
+ if (((encoder->lang->langID == WBXML_LANG_SYNCML_SYNCML10) ||
+- (encoder->lang->langID == WBXML_LANG_SYNCML_SYNCML11)) &&
++ (encoder->lang->langID == WBXML_LANG_SYNCML_SYNCML11) ||
++ (encoder->lang->langID == WBXML_LANG_SYNCML_SYNCML12)) &&
+ (encoder->current_tag != NULL) &&
+ (encoder->current_tag->wbxmlCodePage == 0x01 ) &&
================================================================
Index: SOURCES/wbxml2-r42.patch
diff -u /dev/null SOURCES/wbxml2-r42.patch:1.1
--- /dev/null Wed Oct 22 19:47:55 2008
+++ SOURCES/wbxml2-r42.patch Wed Oct 22 19:47:43 2008
@@ -0,0 +1,25 @@
+Index: /wbxml2/trunk/src/wbxml_encoder.c
+===================================================================
+--- /wbxml2/trunk/src/wbxml_encoder.c (revision 41)
++++ /wbxml2/trunk/src/wbxml_encoder.c (revision 42)
+@@ -1500,6 +1500,6 @@
+ else {
+ #endif /* WBXML_ENCODER_USE_STRTBL */
+- /* Length of String Table is length of XML Public ID */
+- strstbl_len = wbxml_buffer_len(pid);
++ /* Length of String Table is length of XML Public ID (plus the NULL char) */
++ strstbl_len = wbxml_buffer_len(pid) + 1;
+
+ /* There is only the XML Public ID in String Table */
+@@ -1546,8 +1546,10 @@
+
+ if (pid != NULL) {
+- /* The append includes terminating NULL char */
+ if (!wbxml_buffer_append(header, pid))
+ return WBXML_ERROR_ENCODER_APPEND_DATA;
+
++ if (!wbxml_buffer_append_char(header, WBXML_STR_END))
++ return WBXML_ERROR_ENCODER_APPEND_DATA;
++
+ /* Clean up */
+ wbxml_buffer_destroy(pid);
================================================================
Index: SOURCES/wbxml2-r43.patch
diff -u /dev/null SOURCES/wbxml2-r43.patch:1.1
--- /dev/null Wed Oct 22 19:47:56 2008
+++ SOURCES/wbxml2-r43.patch Wed Oct 22 19:47:43 2008
@@ -0,0 +1,59 @@
+Index: /wbxml2/trunk/src/wbxml_parser.c
+===================================================================
+--- /wbxml2/trunk/src/wbxml_parser.c (revision 15)
++++ /wbxml2/trunk/src/wbxml_parser.c (revision 43)
+@@ -660,10 +660,12 @@
+ * (for example, if the version is 0x02, then parser->version will be 0xffffff02)
+ */
+- parser->version = WBXML_VERSION_10;
+-
+- if ((ret = parse_uint8(parser, (WB_UTINY*) &parser->version)) != WBXML_OK)
++ WB_UTINY version = WBXML_VERSION_10;
++
++ if ((ret = parse_uint8(parser, &version)) != WBXML_OK)
+ return ret;
+-
+- WBXML_DEBUG((WBXML_PARSER, "(%d) Parsed version: '0x%X'", parser->pos - 1, (WB_TINY) parser->version));
++
++ parser->version = version;
++
++ WBXML_DEBUG((WBXML_PARSER, "(%d) Parsed version: 1.%d", parser->pos - 1, parser->version));
+
+ return WBXML_OK;
+@@ -939,4 +941,6 @@
+ return ret;
+ }
++
++ WBXML_DEBUG((WBXML_PARSER, "<%s>", wbxml_tag_get_xml_name(element)));
+
+ /* Set Current Tag */
+@@ -991,5 +995,5 @@
+ is_empty);
+ }
+-
++
+ /* Free Attributes */
+ free_attrs_table(attrs);
+@@ -1024,5 +1028,5 @@
+ }
+
+- WBXML_DEBUG((WBXML_PARSER, "(%d) End of Element", parser->pos));
++ WBXML_DEBUG((WBXML_PARSER, "(%d) End of Element", parser->pos - 1));
+
+ /* Skip END */
+@@ -1038,5 +1042,7 @@
+ is_empty);
+ }
+-
++
++ WBXML_DEBUG((WBXML_PARSER, "</%s>", wbxml_tag_get_xml_name(element)));
++
+ /* Free Tag */
+ wbxml_tag_destroy(element);
+@@ -1079,5 +1085,5 @@
+
+ if ((WB_UTINY) parser->version < (WB_UTINY) WBXML_VERSION_12)
+- WBXML_WARNING((WBXML_PARSER, "No Switch Page mecanism possible in WBXML < %s", WBXML_VERSION_TEXT_12));
++ WBXML_WARNING((WBXML_PARSER, "No Switch Page mecanism possible in WBXML < %s (current: %d)", WBXML_VERSION_TEXT_12, (WB_UTINY) parser->version));
+
+ /* Skip SWITCH_PAGE token */
================================================================
Index: SOURCES/wbxml2-r44.patch
diff -u /dev/null SOURCES/wbxml2-r44.patch:1.1
--- /dev/null Wed Oct 22 19:47:57 2008
+++ SOURCES/wbxml2-r44.patch Wed Oct 22 19:47:44 2008
@@ -0,0 +1,29 @@
+Index: /wbxml2/trunk/test/test_parser.c
+===================================================================
+--- /wbxml2/trunk/test/test_parser.c (revision 5)
++++ /wbxml2/trunk/test/test_parser.c (revision 44)
+@@ -40,5 +40,5 @@
+
+ /** Start Document Callback */
+-void parse_clb_start_document(void *ctx, WB_LONG charset, const WBXMLLangEntry *lang)
++void parse_clb_start_document(void *ctx, WBXMLCharsetMIBEnum charset, const WBXMLLangEntry *lang)
+ {
+ printf("Parsing Document:\n"
+Index: /wbxml2/trunk/src/wbxml_parser.c
+===================================================================
+--- /wbxml2/trunk/src/wbxml_parser.c (revision 43)
++++ /wbxml2/trunk/src/wbxml_parser.c (revision 44)
+@@ -278,5 +278,5 @@
+
+ WBXML_WARNING((WBXML_PARSER,
+- "No charset information found, using default : %s",
++ "No charset information found, using default : %x",
+ WBXML_PARSER_DEFAULT_CHARSET));
+ }
+@@ -999,5 +999,5 @@
+ free_attrs_table(attrs);
+
+-
++
+ /* Parse *content */
+ if (!is_empty) {
================================================================
Index: SOURCES/wbxml2-r48.patch
diff -u /dev/null SOURCES/wbxml2-r48.patch:1.1
--- /dev/null Wed Oct 22 19:47:57 2008
+++ SOURCES/wbxml2-r48.patch Wed Oct 22 19:47:44 2008
@@ -0,0 +1,419 @@
+Index: /wbxml2/trunk/src/wbxml_parser.c
+===================================================================
+--- /wbxml2/trunk/src/wbxml_parser.c (revision 44)
++++ /wbxml2/trunk/src/wbxml_parser.c (revision 48)
+@@ -154,4 +154,6 @@
+
+ /* Language Specific Decoding Functions */
++static WBXMLError decode_base64_value(WBXMLBuffer **data);
++
+ #if defined( WBXML_SUPPORT_SI ) || defined( WBXML_SUPPORT_EMN )
+ static WBXMLError decode_datetime(WBXMLBuffer *buff);
+@@ -159,4 +161,5 @@
+
+ static WBXMLError decode_opaque_content(WBXMLParser *parser, WBXMLBuffer **data);
++static WBXMLError decode_opaque_attr_value(WBXMLParser *parser, WBXMLBuffer **data);
+
+ #if defined( WBXML_SUPPORT_WV )
+@@ -165,8 +168,4 @@
+ static WBXMLError decode_wv_datetime(WBXMLBuffer **data);
+ #endif /* WBXML_SUPPORT_WV */
+-
+-#if defined( WBXML_SUPPORT_DRMREL )
+-static WBXMLError decode_drmrel_keyvalue(WBXMLBuffer **data);
+-#endif /* WBXML_SUPPORT_DRMREL */
+
+ /* Macro for error handling */
+@@ -1953,5 +1952,8 @@
+ }
+
+- return parse_opaque(parser, result);
++ if ((ret = parse_opaque(parser, result)) != WBXML_OK)
++ return ret;
++
++ return decode_opaque_attr_value(parser, result);
+ }
+
+@@ -2215,4 +2217,38 @@
+ * Language Specific Decoding Functions
+ */
++
<<Diff was trimmed, longer than 597 lines>>
More information about the pld-cvs-commit
mailing list