Changeset 9c77fbf for protocols/msn

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.

Location:

protocols/msn

Files:

• ns.c (modified) (2 diffs)
• soap.c (modified) (1 diff)

protocols/msn/ns.c

@@ -740 +740 @@
                 char *psm_text = NULL;
                 
-                ubx = xt_from_string( msg );
+                ubx = xt_from_string( msg, msglen );
                 if( ubx && strcmp( ubx->name, "Data" ) == 0 &&
                     ( psm = xt_find_node( ubx->children, "PSM" ) ) )
@@ -752 +752 @@
                 struct xt_node *adl, *d, *c;
                 
-                if( !( adl = xt_from_string( msg ) ) )
+                if( !( adl = xt_from_string( msg, msglen ) ) )
                         return 1;
                 

protocols/msn/soap.c

@@ -229 +229 @@
         if( payload )
         {
-                struct xt_node *xt = xt_from_string( payload );
+                struct xt_node *xt = xt_from_string( payload, 0 );
                 if( xt )
                         xt_print( xt );