Changeset b8a491d

Timestamp:

2010-03-18T00:30:38Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

699376f7

Parents:

78d254f1

Message:

Some compiler warning fixes and renamed "transfers" command to just
"transfer" since all root commands are singular so far.

Files:

• protocols/jabber/s5bytestream.c (modified) (1 diff)
• protocols/jabber/si.c (modified) (7 diffs)
• root_commands.c (modified) (3 diffs)

protocols/jabber/s5bytestream.c

@@ -830 +830 @@
         char *sid;
         GSList *tflist;
-        struct jabber_transfer *tf;
+        struct jabber_transfer *tf = NULL;
         struct xt_node *query;
         struct jabber_data *jd = ic->proto_data;

protocols/jabber/si.c

@@ -41 +41 @@
         if( tf->fd != -1 )
         {
-                disconnect( tf->fd );
+                closesocket( tf->fd );
                 tf->fd = -1;
         }
@@ -156 +156 @@
         if( bud == NULL )
         {
-                imcb_file_canceled( tf->ft, "Couldn't find buddy (BUG?)" );
+                imcb_file_canceled( ft, "Couldn't find buddy (BUG?)" );
                 return;
         }
-                
+        
         imcb_log( ic, "Trying to send %s(%zd bytes) to %s", ft->file_name, ft->file_size, who );
 
@@ -232 +232 @@
             !( name             = xt_find_attr( d, "name" )                             ) ||
             !( size_s           = xt_find_attr( d, "size" )                             ) ||
-            !( 1               == sscanf( size_s, "%lld", &size )                       ) ||
+            !( 1               == sscanf( size_s, "%zd", &size )                        ) ||
             !( d                = xt_find_node( sinode->children, "feature" )           ) ||
             !( strcmp( xt_find_attr( d, "xmlns" ), XMLNS_FEATURE ) == 0                 ) ||
@@ -242 +242 @@
         {
                 imcb_log( ic, "WARNING: Received incomplete Stream Initiation request" );
-        } else
+        }
+        else
         {
                 /* Check if we support one of the options */
@@ -248 +249 @@
                 c = d->children;
                 while( ( c = xt_find_node( c, "option" ) ) )
-                        if(     ( d = xt_find_node( c->children, "value" ) ) &&
-                                ( strcmp( d->text, XMLNS_BYTESTREAMS ) == 0 ) )
+                        if( ( d = xt_find_node( c->children, "value" ) ) &&
+                            ( strcmp( d->text, XMLNS_BYTESTREAMS ) == 0 ) )
                         {
                                 requestok = TRUE;
@@ -259 +260 @@
         }
         
-        if ( requestok )
+        if( requestok )
         {
                 /* Figure out who the transfer should come frome... */
 
+                ext_jid = ini_jid;
                 if( ( s = strchr( ini_jid, '/' ) ) )
                 {
@@ -282 +284 @@
                 *s = '/';
         }
-
-        if ( !requestok )
+        else
         { 
                 reply = jabber_make_error_packet( node, "item-not-found", "cancel", NULL );

root_commands.c

@@ -1128 +1128 @@
 }
 
-static void cmd_transfers( irc_t *irc, char **cmd )
+static void cmd_transfer( irc_t *irc, char **cmd )
 {
         GSList *files = irc->file_transfers;
@@ -1141 +1141 @@
         }
 
-        if( cmd[1] && 
-            ( strcmp( cmd[1], "reject" ) == 0 ) )
+        if( cmd[1] && ( strcmp( cmd[1], "reject" ) == 0 ) )
         {
                 subcmd = REJECT;
         }
-        else if( cmd[1] && 
-                 ( strcmp( cmd[1], "cancel" ) == 0 ) && 
-                 cmd[2] &&
-                 ( fid = atoi( cmd[2] ) ) )
+        else if( cmd[1] && ( strcmp( cmd[1], "cancel" ) == 0 ) && 
+                 cmd[2] && ( sscanf( cmd[2], "%d", &fid ) == 1 ) )
         {
                 subcmd = CANCEL;
@@ -1214 +1211 @@
         { "join_chat",      2, cmd_join_chat,      0 },
         { "chat",           1, cmd_chat,           0 },
-        { "transfers",      0, cmd_transfers,      0 },
+        { "transfer",       0, cmd_transfer,       0 },
         { NULL }
 };