Changes in / [41ca004:ac83732]

Files:

• conf.c (modified) (1 diff)
• ipc.c (modified) (2 diffs)
• irc.c (modified) (1 diff)
• protocols/http_client.c (modified) (2 diffs)
• protocols/http_client.h (modified) (2 diffs)
• protocols/jabber/jabber.c (modified) (1 diff)
• protocols/jabber/xmlparse.c (modified) (4 diffs)
• protocols/nogaim.c (modified) (1 diff)
• protocols/oscar/oscar_util.c (modified) (2 diffs)
• protocols/oscar/service.c (modified) (2 diffs)
• protocols/yahoo/yahoo.c (modified) (1 diff)
• set.c (modified) (1 diff)

conf.c

@@ -95 +95 @@
                         conf->port = i;
                 }
-                else if( opt == 'P' )
+                else if( opt == 'p' )
                 {
                         g_free( conf->pidfile );

ipc.c

@@ -508 +508 @@
         }
 
-        if (bind(serversock, (struct sockaddr *)&un_addr, sizeof(un_addr)) == -1) {
+        if (bind(serversock, &un_addr, sizeof(un_addr)) == -1) {
                 log_message( LOGLVL_WARNING, "Unable to bind UNIX socket to %s: %s", IPCSOCKET, strerror(errno) );
                 return 0;
@@ -566 +566 @@
         ipc_to_children_str( "OPERMSG :New BitlBee master process started (version " BITLBEE_VERSION ")\r\n" );
         
-        fclose( fp );
         return 1;
 }

irc.c

@@ -550 +550 @@
         
         u = user_find( irc, irc->mynick );
-        is_private = u->is_private;
+        if( u ) is_private = u->is_private;
         
         va_start( params, format );

protocols/http_client.c

@@ -69 +69 @@
         
         return( req );
-}
-
-void *http_dorequest_url( char *url_string, http_input_function func, gpointer data )
-{
-        url_t *url = g_new0( url_t, 1 );
-        char *request;
-        void *ret;
-        
-        if( !url_set( url, url_string ) )
-        {
-                g_free( url );
-                return NULL;
-        }
-        
-        if( url->proto != PROTO_HTTP && url->proto != PROTO_HTTPS )
-        {
-                g_free( url );
-                return NULL;
-        }
-        
-        request = g_strdup_printf( "GET %s HTTP/1.0\r\n"
-                                   "Host: %s\r\n"
-                                   "User-Agent: BitlBee " BITLBEE_VERSION " " ARCH "/" CPU "\r\n"
-                                   "\r\n", url->file, url->host );
-        
-        ret = http_dorequest( url->host, url->port,
-                              url->proto == PROTO_HTTPS, request, func, data );
-        
-        g_free( url );
-        g_free( request );
-        return ret;
 }
 
@@ -253 +222 @@
                 evil_server = 1;
         }
-        else if( end1 )
+        else
         {
                 end1 += 2;
         }
-        else
-        {
-                goto cleanup;
-        }
-        
-        *end1 = 0;
-        
-        if( evil_server )
-                req->reply_body = end1 + 1;
-        else
-                req->reply_body = end1 + 2;
-        
-        req->body_size = req->reply_headers + req->bytes_read - req->reply_body;
+        
+        if( end1 )
+        {
+                *end1 = 0;
+                
+                if( evil_server )
+                        req->reply_body = end1 + 1;
+                else
+                        req->reply_body = end1 + 2;
+        }
         
         if( ( end1 = strchr( req->reply_headers, ' ' ) ) != NULL )

protocols/http_client.h

@@ -39 +39 @@
         char *reply_headers;
         char *reply_body;
-        int body_size;
         int finished;
         
@@ -54 +53 @@
 
 void *http_dorequest( char *host, int port, int ssl, char *request, http_input_function func, gpointer data );
-void *http_dorequest_url( char *url_string, http_input_function func, gpointer data );

protocols/jabber/jabber.c

@@ -1553 +1553 @@
         if(jd->gjc != NULL) {
                 gjab_delete(jd->gjc);
-                /* YAY for modules with their own memory pool managers!...
                 g_free(jd->gjc->sid);
-                And a less sarcastic yay for valgrind. :-) */
                 jd->gjc = NULL;
         }

protocols/jabber/xmlparse.c

@@ -1461 +1461 @@
 s = protocolEncodingName;
 #endif
-    if (ns ? XmlInitEncodingNS(&initEncoding, &encoding, s) : XmlInitEncoding(&initEncoding, &encoding, s))
+    if ((ns ? XmlInitEncodingNS : XmlInitEncoding)(&initEncoding, &encoding, s))
         return XML_ERROR_NONE;
     return handleUnknownEncoding(parser, protocolEncodingName);
@@ -1475 +1475 @@
     int standalone = -1;
     if (!(ns
-            ? XmlParseXmlDeclNS(isGeneralTextEntity,
+            ? XmlParseXmlDeclNS
+            : XmlParseXmlDecl)(isGeneralTextEntity,
                                encoding,
                                s,
@@ -1483 +1484 @@
                                &encodingName,
                                &newEncoding,
-                               &standalone)
-            : XmlParseXmlDecl(isGeneralTextEntity,
-                               encoding,
-                               s,
-                               next,
-                               &eventPtr,
-                               &version,
-                               &encodingName,
-                               &newEncoding,
-                               &standalone)))
+                               &standalone))
         return XML_ERROR_SYNTAX;
     if (!isGeneralTextEntity && standalone == 1)
@@ -1545 +1537 @@
             }
             enc = (ns
-                   ? XmlInitUnknownEncodingNS(unknownEncodingMem,
+                   ? XmlInitUnknownEncodingNS
+                   : XmlInitUnknownEncoding)(unknownEncodingMem,
                                              info.map,
                                              info.convert,
-                                             info.data)
-                   : XmlInitUnknownEncoding(unknownEncodingMem,
-                                             info.map,
-                                             info.convert,
-                                             info.data));
+                                             info.data);
             if (enc) {
                 unknownEncodingData = info.data;

protocols/nogaim.c

@@ -610 +610 @@
                         return;
                 }
-                /* Why did we have this here....
-                return; */
+                return;
         }
         

protocols/oscar/oscar_util.c

@@ -109 +109 @@
 
         curPtr = sn;
-        while ( (*curPtr) != (char) '\0') {
+        while ( (*curPtr) != (char) NULL) {
                 if ((*curPtr) != ' ')
                 i++;
@@ -140 +140 @@
         curPtr1 = sn1;
         curPtr2 = sn2;
-        while ( (*curPtr1 != (char) '\0') && (*curPtr2 != (char) '\0') ) {
+        while ( (*curPtr1 != (char) NULL) && (*curPtr2 != (char) NULL) ) {
                 if ( (*curPtr1 == ' ') || (*curPtr2 == ' ') ) {
                         if (*curPtr1 == ' ')

protocols/oscar/service.c

@@ -881 +881 @@
 #endif
 
-/* len can't be 0 here anyway...
                 } else if ((offset == 0x00001000) && (len == 0x00000000)) {
 
@@ -888 +887 @@
                         aimbs_put32(&fr->data, 0xe9800998);
                         aimbs_put32(&fr->data, 0xecf8427e);
-*/
+
                 } else
                         do_error_dialog(sess->aux_data, "WARNING: unknown hash request", "Gaim");

protocols/yahoo/yahoo.c

@@ -608 +608 @@
         struct gaim_connection *gc = byahoo_get_gc_by_id( id );
         
-        serv_got_update( gc, who, stat != YAHOO_STATUS_OFFLINE, 0, 0,
-                         ( stat == YAHOO_STATUS_IDLE ) ? away : 0,
+        serv_got_update( gc, who, stat != YAHOO_STATUS_OFFLINE, 0, 0, 0,
                          ( stat != YAHOO_STATUS_AVAILABLE ) | ( stat << 1 ), 0 );
 }

set.c

@@ -150 +150 @@
         if( s )
         {
-                if( t )
-                        t->next = s->next;
-                else
-                        irc->set = s->next;
-                
+                t->next = s->next;
                 g_free( s->key );
                 if( s->value ) g_free( s->value );