Changeset 9c77fbf for lib/xmltree.c

Timestamp:

2012-09-22T12:47:55Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

6bef211

Parents:

c6fc24a (diff), 11ec078 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline.

File:

• lib/xmltree.c (modified) (1 diff)

lib/xmltree.c

@@ -263 +263 @@
 }
 
-struct xt_node *xt_from_string( const char *in )
+struct xt_node *xt_from_string( const char *in, int len )
 {
         struct xt_parser *parser;
         struct xt_node *ret;
         
+        if( len == 0 )
+                len = strlen( in );
+        
         parser = xt_new( NULL, NULL );
-        xt_feed( parser, in, strlen( in ) );
+        xt_feed( parser, in, len );
         ret = parser->root;
         parser->root = NULL;