Changeset 1c3008a for protocols

Timestamp:

2009-12-13T14:48:56Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e8c8d00

Parents:

2288705

Message:

No functional changes, just some style "fixes". Although I admit I'm
somewhat growing out of my own coding style, I do try to keep things
consistent at least within files.

Comments are now in reviewboard:

​http://code.bitlbee.org/rb/r/13/

Location:

protocols

Files:

• jabber/Makefile (modified) (1 diff)
• jabber/iq.c (modified) (7 diffs)
• jabber/jabber.c (modified) (2 diffs)
• jabber/jabber.h (modified) (1 diff)
• msn/Makefile (modified) (1 diff)
• msn/msn.c (modified) (1 diff)
• msn/sb.c (modified) (1 diff)

protocols/jabber/Makefile

@@ -10 +10 @@
 
 # [SH] Program variables
-objects = conference.o io.o iq.o jabber.o jabber_util.o message.o presence.o sasl.o si.o s5bytestream.o
+objects = conference.o io.o iq.o jabber.o jabber_util.o message.o presence.o s5bytestream.o sasl.o si.o
 
 CFLAGS += -Wall

protocols/jabber/iq.c

@@ -99 +99 @@
                                                    XMLNS_MUC,
                                                    XMLNS_PING,
-                                                   XMLNS_SI,
-                                                   XMLNS_BYTESTREAMS,
-                                                   XMLNS_FILETRANSFER,
+                                                   XMLNS_SI,
+                                                   XMLNS_BYTESTREAMS,
+                                                   XMLNS_FILETRANSFER,
                                                    NULL };
                         const char **f;
@@ -127 +127 @@
         else if( strcmp( type, "set" ) == 0 )
         {
-                if(  ( c = xt_find_node( node->children, "si" ) ) &&
-                     ( strcmp( xt_find_attr( c, "xmlns" ), XMLNS_SI ) == 0 ) )
+                if( ( c = xt_find_node( node->children, "si" ) ) &&
+                    ( strcmp( xt_find_attr( c, "xmlns" ), XMLNS_SI ) == 0 ) )
                 {
                         return jabber_si_handle_request( ic, node, c );
-                } else if( !( c = xt_find_node( node->children, "query" ) ) ||
-                    !( s = xt_find_attr( c, "xmlns" ) ) )
+                }
+                else if( !( c = xt_find_node( node->children, "query" ) ) ||
+                         !( s = xt_find_attr( c, "xmlns" ) ) )
                 {
                         imcb_log( ic, "Warning: Received incomplete IQ-%s packet", type );
                         return XT_HANDLED;
-                } else if( strcmp( s, XMLNS_ROSTER ) == 0 )
+                }
+                else if( strcmp( s, XMLNS_ROSTER ) == 0 )
                 {
                 /* This is a roster push. XMPP servers send this when someone
@@ -160 +162 @@
                                 pack = 0;
                         }
-                } else if( strcmp( s, XMLNS_BYTESTREAMS ) == 0 )
-                {
-                        /* Bytestream Request (stage 2 of file transfer) */
+                }
+                else if( strcmp( s, XMLNS_BYTESTREAMS ) == 0 )
+                {
+                        /* Bytestream Request (stage 2 of file transfer) */
                         return jabber_bs_recv_request( ic, node, c );
-                } else
+                }
+                else
                 {
                         xt_free_node( reply );
@@ -655 +659 @@
         
         c = c->children;
-        while( ( c = xt_find_node( c, "feature" ) ) ) {
+        while( ( c = xt_find_node( c, "feature" ) ) )
+        {
                 feature = xt_find_attr( c, "var" );
-                bud->features = g_slist_append(bud->features, g_strdup(feature) );
+                bud->features = g_slist_append( bud->features, g_strdup( feature ) );
                 c = c->next;
         }
@@ -719 +724 @@
                         c = c->next;
                 }
-        } else if( strcmp( xt_find_attr( c, "xmlns" ), XMLNS_DISCO_INFO ) == 0 )
+        }
+        else if( strcmp( xt_find_attr( c, "xmlns" ), XMLNS_DISCO_INFO ) == 0 )
         {
                 char *category, *type;
@@ -737 +743 @@
                         c = c->next;
                 }
-        } else if( strcmp( xt_find_attr( c, "xmlns" ), XMLNS_BYTESTREAMS ) == 0 )
+        }
+        else if( strcmp( xt_find_attr( c, "xmlns" ), XMLNS_BYTESTREAMS ) == 0 )
         {
                 char *host, *jid;
@@ -761 +768 @@
         if( jd->have_streamhosts == 0 )
                 jd->have_streamhosts++;
+
         return XT_HANDLED;
 }

protocols/jabber/jabber.c

@@ -63 +63 @@
         
         s = set_add( &acc->set, "priority", "0", set_eval_priority, acc );
+
+        s = set_add( &acc->set, "proxy", "<local>;<auto>", NULL, acc );
         
         s = set_add( &acc->set, "resource", "BitlBee", NULL, acc );
@@ -80 +82 @@
         s = set_add( &acc->set, "xmlconsole", "false", set_eval_bool, acc );
         s->flags |= ACC_SET_OFFLINE_ONLY;
-
-        s = set_add( &acc->set, "proxy", "<local>;<auto>", NULL, acc );
 }
 

protocols/jabber/jabber.h

@@ -60 +60 @@
 } jabber_buddy_flags_t;
 
-/* Stores a streamhost's(a.k.a. proxy) data */
+/* Stores a streamhost's (a.k.a. proxy) data */
 typedef struct
 {

protocols/msn/Makefile

@@ -10 +10 @@
 
 # [SH] Program variables
-objects = msn.o msn_util.o ns.o passport.o sb.o tables.o invitation.o
+objects = invitation.o msn.o msn_util.o ns.o passport.o sb.o tables.o
 
 CFLAGS += -Wall

protocols/msn/msn.c

@@ -78 +78 @@
         {
                 while( md->filetransfers ) {
-                        imcb_file_canceled( md->filetransfers->data, "Closing msn connection" );
+                        imcb_file_canceled( md->filetransfers->data, "Closing connection" );
                 }
                 

protocols/msn/sb.c

@@ -174 +174 @@
                         buf = g_new0( char, i );
                         i = g_snprintf( buf, i, MSN_TYPING_HEADERS, sb->ic->acc->user );
-                } else if( strncmp( text, MSN_INVITE_HEADERS, sizeof( MSN_INVITE_HEADERS ) - 1 ) == 0 ) 
+                }
+                else if( strncmp( text, MSN_INVITE_HEADERS, sizeof( MSN_INVITE_HEADERS ) - 1 ) == 0 ) 
                 {
                         buf = g_strdup( text );
                         i = strlen( buf );
-                } else
+                }
+                else
                 {
                         buf = g_new0( char, sizeof( MSN_MESSAGE_HEADERS ) + strlen( text ) * 2 + 1 );