Changeset 6e9ae72 for protocols/msn/soap.c

Timestamp:

2011-12-17T13:50:01Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

18c6d36

Parents:

87dddee (diff), 17f057d (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:

Mainline merge.

File:

• protocols/msn/soap.c (modified) (5 diffs)

protocols/msn/soap.c

@@ -210 +210 @@
 {
         char *s;
-        int st;
         
         if( !getenv( "BITLBEE_DEBUG" ) )
                 return;
         
-        if( ( s = strstr( headers, "\r\n\r\n" ) ) )
-                st = write( 1, s, s - headers + 4 );
-        else
-                st = write( 1, headers, strlen( headers ) );
-        
-#ifdef DEBUG
+        if( headers )
+        {
+                if( ( s = strstr( headers, "\r\n\r\n" ) ) )
+                        write( 2, headers, s - headers + 4 );
+                else
+                        write( 2, headers, strlen( headers ) );
+        }
+        
+        if( payload )
         {
                 struct xt_node *xt = xt_from_string( payload );
@@ -227 +229 @@
                 xt_free_node( xt );
         }
-#endif
 }
 
@@ -661 +662 @@
         
         if( getenv( "BITLBEE_DEBUG" ) )
-                printf( "%p %s %d\n", bu, handle, bd->flags );
+                fprintf( stderr, "%p %s %d\n", bu, handle, bd->flags );
         
         return XT_HANDLED;
@@ -808 +809 @@
         
         if( getenv( "BITLBEE_DEBUG" ) )
-                printf( "%s %s\n", id, name );
+                fprintf( stderr, "%s %s\n", id, name );
         
         return XT_HANDLED;
@@ -869 +870 @@
         
         if( getenv( "BITLBEE_DEBUG" ) )
-                printf( "%s %s %s %s\n", id, type, handle, display_name );
+                fprintf( stderr, "%s %s %s %s\n", id, type, handle, display_name );
         
         return XT_HANDLED;