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/

8 files changed, 51 insertions, 37 deletions

diff --git a/dcc.c b/dcc.c
index b6345a92..655c98b9 100644
--- a/dcc.c
+++ b/dcc.c
@@ -114,7 +114,8 @@ void imcb_file_finished( file_transfer_t *file )
 dcc_file_transfer_t *dcc_alloc_transfer( char *file_name, size_t file_size, struct im_connection *ic )
 {
 	file_transfer_t *file = g_new0( file_transfer_t, 1 );
-	dcc_file_transfer_t *df = file->priv = g_new0( dcc_file_transfer_t, 1);
+	dcc_file_transfer_t *df = file->priv = g_new0( dcc_file_transfer_t, 1 );
+	
 	file->file_size = file_size;
 	file->file_name = g_strdup( file_name );
 	file->local_id = local_transfer_id++;
@@ -143,7 +144,8 @@ file_transfer_t *dccs_send_start( struct im_connection *ic, char *user_nick, cha
 
 	/* listen and request */
 
-	if( ( df->fd = ft_listen( &saddr, host, port, TRUE, &errmsg ) ) == -1 ) {
+	if( ( df->fd = ft_listen( &saddr, host, port, TRUE, &errmsg ) ) == -1 )
+	{
 		dcc_abort( df, "Failed to listen locally, check your ft_listen setting in bitlbee.conf: %s", errmsg );
 		return NULL;
 	}
@@ -160,9 +162,10 @@ file_transfer_t *dccs_send_start( struct im_connection *ic, char *user_nick, cha
 
 	df->progress_timeout = b_timeout_add( DCC_MAX_STALL * 1000, dcc_progress, df );
 
-	imcb_log( ic, "File transfer request from %s for %s (%zd kb). ", user_nick, file_name, file_size/1024 );
-
-	imcb_log( ic, "Accept the file transfer if you'd like the file. If you don't, issue the 'transfers reject' command.");
+	imcb_log( ic, "File transfer request from %s for %s (%zd kb).\n"
+	              "Accept the file transfer if you'd like the file. If you don't, "
+	              "issue the 'transfers reject' command.",
+	              user_nick, file_name, file_size / 1024 );
 
 	return file;
 }
@@ -198,7 +201,7 @@ gboolean dcc_progress( gpointer data, gint fd, b_input_condition cond )
 	{
 		/* no progress. cancel */
 		if( df->bytes_sent == 0 )
-			return dcc_abort( df, "Couldnt establish transfer within %d seconds", DCC_MAX_STALL );
+			return dcc_abort( df, "Couldn't establish transfer within %d seconds", DCC_MAX_STALL );
 		else 
 			return dcc_abort( df, "Transfer stalled for %d seconds at %d kb", DCC_MAX_STALL, df->bytes_sent / 1024 );
 
@@ -229,7 +232,8 @@ int dccs_send_request( struct dcc_file_transfer *df, char *user_nick, struct soc
 		sprintf( ipaddr, "%d", 
 			 ntohl( saddr_ipv4->sin_addr.s_addr ) );
 		port = saddr_ipv4->sin_port;
-	} else 
+	}
+	else 
 	{
 		struct sockaddr_in6 *saddr_ipv6 = ( struct sockaddr_in6 *) saddr;
 
@@ -249,7 +253,7 @@ int dccs_send_request( struct dcc_file_transfer *df, char *user_nick, struct soc
 				df->ft->file_name, ipaddr, port, df->ft->file_size );
 	
 	if ( !irc_msgfrom( df->ic->irc, user_nick, cmd ) )
-		return dcc_abort( df, "couldn't send 'DCC SEND' message to %s", user_nick );
+		return dcc_abort( df, "Couldn't send `DCC SEND' message to %s.", user_nick );
 
 	g_free( cmd );
 
@@ -312,7 +316,7 @@ gboolean dccs_send_proto( gpointer data, gint fd, b_input_condition cond )
 	file_transfer_t *file = df->ft;
 	short revents;
 	
-	if( !dcc_poll( df, fd, &revents) )
+	if( !dcc_poll( df, fd, &revents ) )
 		return FALSE;
 
 	if( ( revents & POLLIN ) &&
@@ -348,18 +352,18 @@ gboolean dccs_send_proto( gpointer data, gint fd, b_input_condition cond )
 		int bytes_received;
 		int ret;
 		
-		ASSERTSOCKOP( ret = recv( fd, &bytes_received, sizeof( bytes_received  ), MSG_PEEK ), "Receiving" );
+		ASSERTSOCKOP( ret = recv( fd, &bytes_received, sizeof( bytes_received ), MSG_PEEK ), "Receiving" );
 
 		if( ret == 0 )
 			return dcc_abort( df, "Remote end closed connection" );
 			
 		if( ret < 4 )
 		{
-			imcb_log( df->ic, "WARNING: DCC SEND: receiver sent only 2 bytes instead of 4, shouldn't happen too often!" );
+			imcb_log( df->ic, "WARNING: DCC SEND: receiver sent only %d bytes instead of 4, shouldn't happen too often!", ret );
 			return TRUE;
 		}
 
-		ASSERTSOCKOP( ret = recv( fd, &bytes_received, sizeof( bytes_received  ), 0 ), "Receiving" );
+		ASSERTSOCKOP( ret = recv( fd, &bytes_received, sizeof( bytes_received ), 0 ), "Receiving" );
 		if( ret != 4 )
 			return dcc_abort( df, "MSG_PEEK'ed 4, but can only dequeue %d bytes", ret );
 
@@ -399,7 +403,7 @@ gboolean dccs_recv_start( file_transfer_t *ft )
 	if( !ft->write )
 		return dcc_abort( df, "BUG: protocol didn't register write()" );
 	
-	ASSERTSOCKOP( fd = df->fd = socket( saddr->ss_family, SOCK_STREAM, 0 ) , "Opening Socket" );
+	ASSERTSOCKOP( fd = df->fd = socket( saddr->ss_family, SOCK_STREAM, 0 ), "Opening Socket" );
 
 	sock_make_nonblocking( fd );
 
@@ -428,7 +432,7 @@ gboolean dccs_recv_start( file_transfer_t *ft )
 	return TRUE;
 }
 
-gboolean dccs_recv_proto( gpointer data, gint fd, b_input_condition cond)
+gboolean dccs_recv_proto( gpointer data, gint fd, b_input_condition cond )
 {
 	dcc_file_transfer_t *df = data;
 	file_transfer_t *ft = df->ft;
diff --git a/protocols/jabber/Makefile b/protocols/jabber/Makefile
index 891df5eb..78a02696 100644
--- a/protocols/jabber/Makefile
+++ b/protocols/jabber/Makefile
@@ -9,7 +9,7 @@
 -include ../../Makefile.settings
 
 # [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
 LFLAGS += -r
diff --git a/protocols/jabber/iq.c b/protocols/jabber/iq.c
index f17a7bb5..e0658a9e 100644
--- a/protocols/jabber/iq.c
+++ b/protocols/jabber/iq.c
@@ -98,9 +98,9 @@ xt_status jabber_pkt_iq( struct xt_node *node, gpointer data )
 			                           XMLNS_CHATSTATES,
 			                           XMLNS_MUC,
 			                           XMLNS_PING,
-						   XMLNS_SI,
-						   XMLNS_BYTESTREAMS,
-						   XMLNS_FILETRANSFER,
+			                           XMLNS_SI,
+			                           XMLNS_BYTESTREAMS,
+			                           XMLNS_FILETRANSFER,
 			                           NULL };
 			const char **f;
 			
@@ -126,16 +126,18 @@ xt_status jabber_pkt_iq( struct xt_node *node, gpointer data )
 	}
 	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
 		   was added to (or removed from) the buddy list. AFAIK they're
@@ -159,11 +161,13 @@ xt_status jabber_pkt_iq( struct xt_node *node, gpointer data )
 				reply = jabber_make_error_packet( node, "not-allowed", "cancel", NULL );
 				pack = 0;
 			}
-		} else if( strcmp( s, XMLNS_BYTESTREAMS ) == 0 )
+		}
+		else if( strcmp( s, XMLNS_BYTESTREAMS ) == 0 )
 		{
-		     	/* Bytestream Request (stage 2 of file transfer) */
+			/* Bytestream Request (stage 2 of file transfer) */
 			return jabber_bs_recv_request( ic, node, c );
-		} else
+		}
+		else
 		{
 			xt_free_node( reply );
 			reply = jabber_make_error_packet( node, "feature-not-implemented", "cancel", NULL );
@@ -654,9 +658,10 @@ xt_status jabber_iq_parse_features( struct im_connection *ic, struct xt_node *no
 	}
 	
 	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;
 	}
 
@@ -718,7 +723,8 @@ xt_status jabber_iq_parse_server_features( struct im_connection *ic, struct xt_n
 
 			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;
 
@@ -736,7 +742,8 @@ xt_status jabber_iq_parse_server_features( struct im_connection *ic, struct xt_n
 
 			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;
 		int port;
@@ -760,5 +767,6 @@ xt_status jabber_iq_parse_server_features( struct im_connection *ic, struct xt_n
 
 	if( jd->have_streamhosts == 0 )
 		jd->have_streamhosts++;
+
 	return XT_HANDLED;
 }
diff --git a/protocols/jabber/jabber.c b/protocols/jabber/jabber.c
index 15341c9b..02461101 100644
--- a/protocols/jabber/jabber.c
+++ b/protocols/jabber/jabber.c
@@ -62,6 +62,8 @@ static void jabber_init( account_t *acc )
 	s->flags |= ACC_SET_OFFLINE_ONLY;
 	
 	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 );
 	s->flags |= ACC_SET_OFFLINE_ONLY;
@@ -79,8 +81,6 @@ static void jabber_init( account_t *acc )
 	
 	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 );
 }
 
 static void jabber_generate_id_hash( struct jabber_data *jd );
diff --git a/protocols/jabber/jabber.h b/protocols/jabber/jabber.h
index 9f101f83..898c4978 100644
--- a/protocols/jabber/jabber.h
+++ b/protocols/jabber/jabber.h
@@ -59,7 +59,7 @@ typedef enum
 	                                   have a real JID. */
 } jabber_buddy_flags_t;
 
-/* Stores a streamhost's(a.k.a. proxy) data */
+/* Stores a streamhost's (a.k.a. proxy) data */
 typedef struct
 {
 	char *jid;
diff --git a/protocols/msn/Makefile b/protocols/msn/Makefile
index dd5d46e2..5d199b9e 100644
--- a/protocols/msn/Makefile
+++ b/protocols/msn/Makefile
@@ -9,7 +9,7 @@
 -include ../../Makefile.settings
 
 # [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
 LFLAGS += -r
diff --git a/protocols/msn/msn.c b/protocols/msn/msn.c
index 590a1382..b17a0bfa 100644
--- a/protocols/msn/msn.c
+++ b/protocols/msn/msn.c
@@ -77,7 +77,7 @@ static void msn_logout( struct im_connection *ic )
 	if( md )
 	{
 		while( md->filetransfers ) {
-			imcb_file_canceled( md->filetransfers->data, "Closing msn connection" );
+			imcb_file_canceled( md->filetransfers->data, "Closing connection" );
 		}
 		
 		if( md->fd >= 0 )
diff --git a/protocols/msn/sb.c b/protocols/msn/sb.c
index b60a9a8b..c3302e57 100644
--- a/protocols/msn/sb.c
+++ b/protocols/msn/sb.c
@@ -173,11 +173,13 @@ int msn_sb_sendmessage( struct msn_switchboard *sb, char *text )
 			i = strlen( MSN_TYPING_HEADERS ) + strlen( sb->ic->acc->user );
 			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 );
 			i = strlen( MSN_MESSAGE_HEADERS );