Changeset 327af51 for lib

Timestamp:

2010-08-21T17:27:32Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

4022b68

Parents:

a366cca

Message:

Some general cleanup, plus fixing a bug in the memberlist parsing code:
the lists can come in in any order, so parse it *completely* before showing
auth requests.

Location:

lib

Files:

• ssl_gnutls.c (modified) (2 diffs)
• ssl_openssl.c (modified) (2 diffs)
• xmltree.c (modified) (2 diffs)

lib/ssl_gnutls.c

@@ -189 +189 @@
                 ssl_errno = SSL_AGAIN;
         
-        if( getenv( "BITLBEE_DEBUG" ) && st > 0 ) write( 1, buf, st );
+        if( 0 && getenv( "BITLBEE_DEBUG" ) && st > 0 ) write( 1, buf, st );
         
         return st;
@@ -210 +210 @@
                 ssl_errno = SSL_AGAIN;
         
-        if( getenv( "BITLBEE_DEBUG" ) && st > 0 ) write( 1, buf, st );
+        if( 0 && getenv( "BITLBEE_DEBUG" ) && st > 0 ) write( 1, buf, st );
         
         return st;

lib/ssl_openssl.c

@@ -207 +207 @@
         }
         
-        if( getenv( "BITLBEE_DEBUG" ) && st > 0 ) write( 1, buf, st );
+        if( 0 && getenv( "BITLBEE_DEBUG" ) && st > 0 ) write( 1, buf, st );
         
         return st;
@@ -224 +224 @@
         st = SSL_write( ((struct scd*)conn)->ssl, buf, len );
         
-        if( getenv( "BITLBEE_DEBUG" ) && st > 0 ) write( 1, buf, st );
+        if( 0 && getenv( "BITLBEE_DEBUG" ) && st > 0 ) write( 1, buf, st );
         
         ssl_errno = SSL_OK;

lib/xmltree.c

@@ -338 +338 @@
         /* Print the attributes */
         for( i = 0; node->attr[i].key; i ++ )
-                printf( " %s=\"%s\"", node->attr[i].key, g_markup_escape_text( node->attr[i].value, -1 ) );
+        {
+                char *v = g_markup_escape_text( node->attr[i].value, -1 );
+                printf( " %s=\"%s\"", node->attr[i].key, v );
+                g_free( v );
+        }
         
         /* /> in case there's really *nothing* inside this tag, otherwise
@@ -358 +362 @@
                 for( i = 0; node->text[i] && isspace( node->text[i] ); i ++ );
                 if( node->text[i] )
-                        printf( "%s", g_markup_escape_text( node->text, -1 ) );
+                {
+                        char *v = g_markup_escape_text( node->text, -1 );
+                        printf( "%s", v );
+                        g_free( v );
+                }
         }