Changeset ca974d7 for lib

Timestamp:

2011-12-04T19:14:29Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

df98ee8

Parents:

bd31661

Message:

Debug output tweaks: Try to send everything to stderr, and add ifdef to
enable printing of all SSL traffic.

Location:

lib

Files:

• ssl_gnutls.c (modified) (3 diffs)
• xmltree.c (modified) (7 diffs)

lib/ssl_gnutls.c

@@ -44 +44 @@
 #define GNUTLS_STUPID_CAST (int)
 #endif
+
+#define SSLDEBUG 0
 
 struct scd
@@ -198 +200 @@
                 ssl_errno = SSL_AGAIN;
         
-        if( 0 && getenv( "BITLBEE_DEBUG" ) && st > 0 ) len = write( 1, buf, st );
+        if( SSLDEBUG && getenv( "BITLBEE_DEBUG" ) && st > 0 ) len = write( 2, buf, st );
         
         return st;
@@ -219 +221 @@
                 ssl_errno = SSL_AGAIN;
         
-        if( 0 && getenv( "BITLBEE_DEBUG" ) && st > 0 ) len = write( 1, buf, st );
+        if( SSLDEBUG && getenv( "BITLBEE_DEBUG" ) && st > 0 ) len = write( 2, buf, st );
         
         return st;

lib/xmltree.c

@@ -330 +330 @@
         /* Indentation */
         for( c = node; c->parent; c = c->parent )
-                printf( "    " );
+                fprintf( stderr, "    " );
         
         /* Start the tag */
-        printf( "<%s", node->name );
+        fprintf( stderr, "<%s", node->name );
         
         /* Print the attributes */
@@ -339 +339 @@
         {
                 char *v = g_markup_escape_text( node->attr[i].value, -1 );
-                printf( " %s=\"%s\"", node->attr[i].key, v );
+                fprintf( stderr, " %s=\"%s\"", node->attr[i].key, v );
                 g_free( v );
         }
@@ -348 +348 @@
         if( node->text == NULL && node->children == NULL )
         {
-                printf( "/>\n" );
+                fprintf( stderr, "/>\n" );
                 return;
                 /* Then we're finished! */
@@ -354 +354 @@
         
         /* Otherwise... */
-        printf( ">" );
+        fprintf( stderr, ">" );
         
         /* Only print the text if it contains more than whitespace (TEST). */
@@ -363 +363 @@
                 {
                         char *v = g_markup_escape_text( node->text, -1 );
-                        printf( "%s", v );
+                        fprintf( stderr, "%s", v );
                         g_free( v );
                 }
@@ -369 +369 @@
         
         if( node->children )
-                printf( "\n" );
+                fprintf( stderr, "\n" );
         
         for( c = node->children; c; c = c->next )
@@ -376 +376 @@
         if( node->children )
                 for( c = node; c->parent; c = c->parent )
-                        printf( "    " );
+                        fprintf( stderr, "    " );
         
         /* Non-empty tag is now finished. */
-        printf( "</%s>\n", node->name );
+        fprintf( stderr, "</%s>\n", node->name );
 }