Changeset f73b969 for root_commands.c

Timestamp:

2006-01-20T15:15:49Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

54879ab, f1d38f2

Parents:

55ec2d6

Message:

Renamed commands.c, got rid of return values in all command functions.

File:

• root_commands.c (moved) (moved from commands.c) (44 diffs)

root_commands.c

@@ -32 +32 @@
 #include <string.h>
 
-int root_command_string( irc_t *irc, user_t *u, char *command, int flags )
+void root_command_string( irc_t *irc, user_t *u, char *command, int flags )
 {
         char *cmd[IRC_MAX_ARGS];
@@ -64 +64 @@
         cmd[k] = NULL;
         
-        return( root_command( irc, cmd ) );
-}
-
-int root_command( irc_t *irc, char *cmd[] )
+        root_command( irc, cmd );
+}
+
+void root_command( irc_t *irc, char *cmd[] )
 {       
         int i;
         
         if( !cmd[0] )
-                return( 0 );
+                return;
         
         for( i = 0; commands[i].command; i++ )
@@ -80 +80 @@
                         {
                                 irc_usermsg( irc, "Not enough parameters given (need %d)", commands[i].required_parameters );
-                                return( 0 );
+                                return;
                         }
                         commands[i].execute( irc, cmd );
-                        return( 1 );
+                        return;
                 }
         
         irc_usermsg( irc, "Unknown command: %s. Please use \x02help commands\x02 to get a list of available commands.", cmd[0] );
-        
-        return( 1 );
-}
-
-static int cmd_help( irc_t *irc, char **cmd )
+}
+
+static void cmd_help( irc_t *irc, char **cmd )
 {
         char param[80];
@@ -111 +109 @@
                 irc_usermsg( irc, "%s", s );
                 g_free( s );
-                return( 1 );
         }
         else
         {
                 irc_usermsg( irc, "Error opening helpfile." );
-                return( 0 );
-        }
-}
-
-static int cmd_identify( irc_t *irc, char **cmd )
+        }
+}
+
+static void cmd_identify( irc_t *irc, char **cmd )
 {
         storage_status_t status = storage_load( irc->nick, cmd[1], irc );
@@ -139 +135 @@
                 break;
         }
-
-        return( 0 );
-}
-
-static int cmd_register( irc_t *irc, char **cmd )
+}
+
+static void cmd_register( irc_t *irc, char **cmd )
 {
         if( global.conf->authmode == AUTHMODE_REGISTERED )
         {
                 irc_usermsg( irc, "This server does not allow registering new accounts" );
-                return( 0 );
+                return;
         }
 
@@ -166 +160 @@
                         break;
         }
-        
-        return( 0 );
-}
-
-static int cmd_drop( irc_t *irc, char **cmd )
+}
+
+static void cmd_drop( irc_t *irc, char **cmd )
 {
         storage_status_t status;
@@ -178 +170 @@
         case STORAGE_NO_SUCH_USER:
                 irc_usermsg( irc, "That account does not exist" );
-                return( 0 );
+                break;
         case STORAGE_INVALID_PASSWORD:
                 irc_usermsg( irc, "Password invalid" );
-                return( 0 );
+                break;
         case STORAGE_OK:
                 irc_setpass( irc, NULL );
@@ -187 +179 @@
                 irc_umode_set( irc, "-R", 1 );
                 irc_usermsg( irc, "Account `%s' removed", irc->nick );
-                return( 0 );
+                break;
         default:
                 irc_usermsg( irc, "Error: '%d'", status );
-                return( 0 );
-        }
-}
-
-static int cmd_account( irc_t *irc, char **cmd )
+                break;
+        }
+}
+
+static void cmd_account( irc_t *irc, char **cmd )
 {
         account_t *a;
@@ -201 +193 @@
         {
                 irc_usermsg( irc, "This server only accepts registered users" );
-                return( 0 );
+                return;
         }
         
@@ -211 +203 @@
                 {
                         irc_usermsg( irc, "Not enough parameters" );
-                        return( 0 );
+                        return;
                 }
                 
@@ -219 +211 @@
                 {
                         irc_usermsg( irc, "Unknown protocol" );
-                        return( 0 );
+                        return;
                 }
 
@@ -281 +273 @@
                                 {
                                         irc_usermsg( irc, "Account already online" );
-                                        return( 0 );
+                                        return;
                                 }
                                 else
@@ -291 +283 @@
                         {
                                 irc_usermsg( irc, "Invalid account" );
-                                return( 0 );
+                                return;
                         }
                 }
@@ -337 +329 @@
                         {
                                 irc_usermsg( irc, "Account already offline" );
-                                return( 0 );
+                                return;
                         }
                 }
@@ -343 +335 @@
                 {
                         irc_usermsg( irc, "Invalid account" );
-                        return( 0 );
+                        return;
                 }
         }
@@ -350 +342 @@
                 irc_usermsg( irc, "Unknown command: account %s. Please use \x02help commands\x02 to get a list of available commands.", cmd[1] );
         }
-        
-        return( 1 );
-}
-
-static int cmd_add( irc_t *irc, char **cmd )
+}
+
+static void cmd_add( irc_t *irc, char **cmd )
 {
         account_t *a;
@@ -361 +351 @@
         {
                 irc_usermsg( irc, "Invalid account" );
-                return( 1 );
+                return;
         }
         else if( !( a->gc && ( a->gc->flags & OPT_LOGGED_IN ) ) )
         {
                 irc_usermsg( irc, "That account is not on-line" );
-                return( 1 );
+                return;
         }
         
@@ -374 +364 @@
                 {
                         irc_usermsg( irc, "The requested nick `%s' is invalid", cmd[3] );
-                        return( 0 );
+                        return;
                 }
                 else if( user_find( irc, cmd[3] ) )
                 {
                         irc_usermsg( irc, "The requested nick `%s' already exists", cmd[3] );
-                        return( 0 );
+                        return;
                 }
                 else
@@ -390 +380 @@
         
         irc_usermsg( irc, "User `%s' added to your contact list as `%s'", cmd[2], user_findhandle( a->gc, cmd[2] )->nick );
-        
-        return( 0 );
-}
-
-static int cmd_info( irc_t *irc, char **cmd )
+}
+
+static void cmd_info( irc_t *irc, char **cmd )
 {
         struct gaim_connection *gc;
@@ -405 +393 @@
                 {
                         irc_usermsg( irc, "Nick `%s' does not exist", cmd[1] );
-                        return( 1 );
+                        return;
                 }
                 gc = u->gc;
@@ -413 +401 @@
         {
                 irc_usermsg( irc, "Invalid account" );
-                return( 1 );
+                return;
         }
         else if( !( ( gc = a->gc ) && ( a->gc->flags & OPT_LOGGED_IN ) ) )
         {
                 irc_usermsg( irc, "That account is not on-line" );
-                return( 1 );
+                return;
         }
         
@@ -424 +412 @@
         {
                 irc_usermsg( irc, "Command `%s' not supported by this protocol", cmd[0] );
-                return( 1 );
-        }
-        gc->prpl->get_info( gc, cmd[2] );
-        
-        return( 0 );
-}
-
-static int cmd_rename( irc_t *irc, char **cmd )
+        }
+        else
+        {
+                gc->prpl->get_info( gc, cmd[2] );
+        }
+}
+
+static void cmd_rename( irc_t *irc, char **cmd )
 {
         user_t *u;
@@ -438 +426 @@
         {
                 irc_usermsg( irc, "Nick `%s' can't be changed", cmd[1] );
-                return( 1 );
-        }
-        if( user_find( irc, cmd[2] ) && ( nick_cmp( cmd[1], cmd[2] ) != 0 ) )
+        }
+        else if( user_find( irc, cmd[2] ) && ( nick_cmp( cmd[1], cmd[2] ) != 0 ) )
         {
                 irc_usermsg( irc, "Nick `%s' already exists", cmd[2] );
-                return( 1 );
-        }
-        if( !nick_ok( cmd[2] ) )
+        }
+        else if( !nick_ok( cmd[2] ) )
         {
                 irc_usermsg( irc, "Nick `%s' is invalid", cmd[2] );
-                return( 1 );
-        }
-        if( !( u = user_find( irc, cmd[1] ) ) )
+        }
+        else if( !( u = user_find( irc, cmd[1] ) ) )
         {
                 irc_usermsg( irc, "Nick `%s' does not exist", cmd[1] );
-                return( 1 );
-        }
-        user_rename( irc, cmd[1], cmd[2] );
-        irc_write( irc, ":%s!%s@%s NICK %s", cmd[1], u->user, u->host, cmd[2] );
-        if( g_strcasecmp( cmd[1], irc->mynick ) == 0 )
-        {
-                g_free( irc->mynick );
-                irc->mynick = g_strdup( cmd[2] );
-        }
-        else if( u->send_handler == buddy_send_handler )
-        {
-                nick_set( irc, u->handle, u->gc->prpl, cmd[2] );
-        }
-        
-        irc_usermsg( irc, "Nick successfully changed" );
-        
-        return( 0 );
-}
-
-static int cmd_remove( irc_t *irc, char **cmd )
+        }
+        else
+        {
+                user_rename( irc, cmd[1], cmd[2] );
+                irc_write( irc, ":%s!%s@%s NICK %s", cmd[1], u->user, u->host, cmd[2] );
+                if( g_strcasecmp( cmd[1], irc->mynick ) == 0 )
+                {
+                        g_free( irc->mynick );
+                        irc->mynick = g_strdup( cmd[2] );
+                }
+                else if( u->send_handler == buddy_send_handler )
+                {
+                        nick_set( irc, u->handle, u->gc->prpl, cmd[2] );
+                }
+                
+                irc_usermsg( irc, "Nick successfully changed" );
+        }
+}
+
+static void cmd_remove( irc_t *irc, char **cmd )
 {
         user_t *u;
@@ -480 +465 @@
         {
                 irc_usermsg( irc, "Buddy `%s' not found", cmd[1] );
-                return( 1 );
+                return;
         }
         s = g_strdup( u->handle );
@@ -491 +476 @@
         g_free( s );
         
-        return( 0 );
-}
-
-static int cmd_block( irc_t *irc, char **cmd )
+        return;
+}
+
+static void cmd_block( irc_t *irc, char **cmd )
 {
         struct gaim_connection *gc;
@@ -505 +490 @@
                 {
                         irc_usermsg( irc, "Nick `%s' does not exist", cmd[1] );
-                        return( 1 );
+                        return;
                 }
                 gc = u->gc;
@@ -513 +498 @@
         {
                 irc_usermsg( irc, "Invalid account" );
-                return( 1 );
+                return;
         }
         else if( !( ( gc = a->gc ) && ( a->gc->flags & OPT_LOGGED_IN ) ) )
         {
                 irc_usermsg( irc, "That account is not on-line" );
-                return( 1 );
+                return;
         }
         
@@ -531 +516 @@
                 irc_usermsg( irc, "Buddy `%s' moved from your permit- to your deny-list", cmd[2] );
         }
-        
-        return( 0 );
-}
-
-static int cmd_allow( irc_t *irc, char **cmd )
+}
+
+static void cmd_allow( irc_t *irc, char **cmd )
 {
         struct gaim_connection *gc;
@@ -546 +529 @@
                 {
                         irc_usermsg( irc, "Nick `%s' does not exist", cmd[1] );
-                        return( 1 );
+                        return;
                 }
                 gc = u->gc;
@@ -554 +537 @@
         {
                 irc_usermsg( irc, "Invalid account" );
-                return( 1 );
+                return;
         }
         else if( !( ( gc = a->gc ) && ( a->gc->flags & OPT_LOGGED_IN ) ) )
         {
                 irc_usermsg( irc, "That account is not on-line" );
-                return( 1 );
+                return;
         }
         
@@ -573 +556 @@
                 irc_usermsg( irc, "Buddy `%s' moved from your deny- to your permit-list", cmd[2] );
         }
-        
-        return( 0 );
-}
-
-static int cmd_yesno( irc_t *irc, char **cmd )
+}
+
+static void cmd_yesno( irc_t *irc, char **cmd )
 {
         query_t *q = NULL;
@@ -585 +566 @@
         {
                 irc_usermsg( irc, "Did I ask you something?" );
-                return( 0 );
+                return;
         }
         
@@ -595 +576 @@
                 {
                         irc_usermsg( irc, "Invalid query number" );
-                        return( 0 );
+                        return;
                 }
                 
@@ -605 +586 @@
                 {
                         irc_usermsg( irc, "Uhm, I never asked you something like that..." );
-                        return( 0 );
+                        return;
                 }
         }
@@ -613 +594 @@
         else if( g_strcasecmp( cmd[0], "no" ) == 0 )
                 query_answer( irc, q, 0 );
-        
-        return( 1 );
-}
-
-static int cmd_set( irc_t *irc, char **cmd )
+}
+
+static void cmd_set( irc_t *irc, char **cmd )
 {
         if( cmd[1] && cmd[2] )
@@ -639 +618 @@
                 }
         }
-        
-        return( 0 );
-}
-
-static int cmd_save( irc_t *irc, char **cmd )
+}
+
+static void cmd_save( irc_t *irc, char **cmd )
 {
         if( storage_save( irc, TRUE ) == STORAGE_OK )
@@ -649 +626 @@
         else
                 irc_usermsg( irc, "Configuration could not be saved!" );
-        
-        return( 0 );
-}
-
-static int cmd_blist( irc_t *irc, char **cmd )
+}
+
+static void cmd_blist( irc_t *irc, char **cmd )
 {
         int online = 0, away = 0, offline = 0;
@@ -695 +670 @@
         
         irc_usermsg( irc, "%d buddies (%d available, %d away, %d offline)", n_online + n_away + n_offline, n_online, n_away, n_offline );
-        
-        return( 0 );
-}
-
-static int cmd_nick( irc_t *irc, char **cmd ) 
+}
+
+static void cmd_nick( irc_t *irc, char **cmd ) 
 {
         account_t *a;
@@ -731 +704 @@
                         a->gc->prpl->set_info( a->gc, cmd[2] );
         }
-        
-        return( 1 );
-}
-
-static int cmd_qlist( irc_t *irc, char **cmd )
+}
+
+static void cmd_qlist( irc_t *irc, char **cmd )
 {
         query_t *q = irc->queries;
@@ -743 +714 @@
         {
                 irc_usermsg( irc, "There are no pending questions." );
-                return( 0 );
+                return;
         }
         
@@ -753 +724 @@
                 else
                         irc_usermsg( irc, "%d, BitlBee: %s", num, q->question );
-        
-        return( 0 );
-}
-
-static int cmd_import_buddies( irc_t *irc, char **cmd )
+}
+
+static void cmd_import_buddies( irc_t *irc, char **cmd )
 {
         struct gaim_connection *gc;
@@ -766 +735 @@
         {
                 irc_usermsg( irc, "Invalid account" );
-                return( 0 );
+                return;
         }
         else if( !( ( gc = a->gc ) && ( a->gc->flags & OPT_LOGGED_IN ) ) )
         {
                 irc_usermsg( irc, "That account is not on-line" );
-                return( 0 );
+                return;
         }
         
@@ -792 +761 @@
                 {
                         irc_usermsg( irc, "Invalid argument: %s", cmd[2] );
-                        return( 0 );
+                        return;
                 }
         }
@@ -806 +775 @@
         
         irc_usermsg( irc, "Sent all add requests. Please wait for a while, the server needs some time to handle all the adds." );
-        
-        return( 0 );
 }