Changeset 9c77fbf for protocols/msn


Ignore:
Timestamp:
2012-09-22T12:47:55Z (11 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:
2 edited

Legend:

Unmodified
Added
Removed
  • protocols/msn/ns.c

    rc6fc24a r9c77fbf  
    740740                char *psm_text = NULL;
    741741               
    742                 ubx = xt_from_string( msg );
     742                ubx = xt_from_string( msg, msglen );
    743743                if( ubx && strcmp( ubx->name, "Data" ) == 0 &&
    744744                    ( psm = xt_find_node( ubx->children, "PSM" ) ) )
     
    752752                struct xt_node *adl, *d, *c;
    753753               
    754                 if( !( adl = xt_from_string( msg ) ) )
     754                if( !( adl = xt_from_string( msg, msglen ) ) )
    755755                        return 1;
    756756               
  • protocols/msn/soap.c

    rc6fc24a r9c77fbf  
    229229        if( payload )
    230230        {
    231                 struct xt_node *xt = xt_from_string( payload );
     231                struct xt_node *xt = xt_from_string( payload, 0 );
    232232                if( xt )
    233233                        xt_print( xt );
Note: See TracChangeset for help on using the changeset viewer.