aboutsummaryrefslogtreecommitdiffstats
path: root/protocols/msn
diff options
context:
space:
mode:
authorWilmer van der Gaast <wilmer@gaast.net>2011-12-06 21:50:43 +0000
committerWilmer van der Gaast <wilmer@gaast.net>2011-12-06 21:50:43 +0000
commitb041b521c8b347c4660b0920f17b92b9c1484f49 (patch)
tree28cc72e1ac3158dbdd6e2c908dcc8a848f0272e3 /protocols/msn
parentdf98ee8b4abaa890a02e706d69b93724e8f7744d (diff)
parentd7edadf94be620d226b569f5e14f45de7f08c03a (diff)
Merging compiler warning fixes from vmiklos.
This change also uncovered one bug in groupchat handling in OSCAR, which I fixed during the merge.
Diffstat (limited to 'protocols/msn')
-rw-r--r--protocols/msn/sb.c6
-rw-r--r--protocols/msn/soap.c5
2 files changed, 2 insertions, 9 deletions
diff --git a/protocols/msn/sb.c b/protocols/msn/sb.c
index 37ac2889..69114469 100644
--- a/protocols/msn/sb.c
+++ b/protocols/msn/sb.c
@@ -307,7 +307,6 @@ gboolean msn_sb_connected( gpointer data, gint source, b_input_condition cond )
{
struct msn_switchboard *sb = data;
struct im_connection *ic;
- struct msn_data *md;
char buf[1024];
/* Are we still alive? */
@@ -315,7 +314,6 @@ gboolean msn_sb_connected( gpointer data, gint source, b_input_condition cond )
return FALSE;
ic = sb->ic;
- md = ic->proto_data;
if( source != sb->fd )
{
@@ -674,16 +672,12 @@ static int msn_sb_message( struct msn_handler_data *handler, char *msg, int msgl
struct msn_switchboard *sb = handler->data;
struct im_connection *ic = sb->ic;
char *body;
- int blen = 0;
if( !num_parts )
return( 1 );
if( ( body = strstr( msg, "\r\n\r\n" ) ) )
- {
body += 4;
- blen = msglen - ( body - msg );
- }
if( strcmp( cmd[0], "MSG" ) == 0 )
{
diff --git a/protocols/msn/soap.c b/protocols/msn/soap.c
index ccfc1a67..7d9f3791 100644
--- a/protocols/msn/soap.c
+++ b/protocols/msn/soap.c
@@ -209,7 +209,6 @@ static char *msn_soap_abservice_build( const char *body_fmt, const char *scenari
static void msn_soap_debug_print( const char *headers, const char *payload )
{
char *s;
- int st;
if( !getenv( "BITLBEE_DEBUG" ) )
return;
@@ -217,9 +216,9 @@ static void msn_soap_debug_print( const char *headers, const char *payload )
if( headers )
{
if( ( s = strstr( headers, "\r\n\r\n" ) ) )
- st = write( 2, headers, s - headers + 4 );
+ write( 2, headers, s - headers + 4 );
else
- st = write( 2, headers, strlen( headers ) );
+ write( 2, headers, strlen( headers ) );
}
if( payload )