Changeset f73b969

Timestamp:

2006-01-20T15:15:49Z (19 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.

Files:

• Makefile (modified) (1 diff)
• bitlbee.c (modified) (1 diff)
• bitlbee.h (modified) (1 diff)
• commands.h (modified) (1 diff)
• ipc.c (modified) (6 diffs)
• ipc.h (modified) (1 diff)
• irc.c (modified) (10 diffs)
• irc.h (modified) (3 diffs)
• irc_commands.c (modified) (24 diffs)
• root_commands.c (moved) (moved from commands.c) (44 diffs)
• user.h (modified) (1 diff)

Makefile

@@ -10 +10 @@
 
 # Program variables
-objects = account.o bitlbee.o commands.o conf.o crypting.o help.o ini.o ipc.o irc.o irc_commands.o log.o nick.o query.o set.o storage.o storage_text.o unix.o url.o user.o util.o
+objects = account.o bitlbee.o conf.o crypting.o help.o ini.o ipc.o irc.o irc_commands.o log.o nick.o query.o root_commands.o set.o storage.o storage_text.o unix.o url.o user.o util.o
 subdirs = protocols
 

bitlbee.c

@@ -167 +167 @@
         }
         
-        if( !irc_process( irc ) )
-        {
-                log_message( LOGLVL_INFO, "Destroying connection with fd %d.", irc->fd );
-                irc_abort( irc );
+        irc_process( irc );
+        
+        /* Normally, irc_process() shouldn't call irc_free() but irc_abort(). Just in case: */
+        if( !g_slist_find( irc_connection_list, irc ) )
+        {
+                log_message( LOGLVL_WARNING, "Abnormal termination of connection with fd %d.", irc->fd );
                 return FALSE;
         } 

bitlbee.h

@@ -129 +129 @@
 gboolean bitlbee_io_current_client_write( GIOChannel *source, GIOCondition condition, gpointer data );
 
-int root_command_string( irc_t *irc, user_t *u, char *command, int flags );
-int root_command( irc_t *irc, char *command[] );
+void root_command_string( irc_t *irc, user_t *u, char *command, int flags );
+void root_command( irc_t *irc, char *command[] );
 void bitlbee_shutdown( gpointer data );
 double gettime( void );

commands.h

@@ -33 +33 @@
         char *command;
         int required_parameters;
-        int (*execute)(irc_t *, char **args);
+        void (*execute)(irc_t *, char **args);
         int flags;
 } command_t;

ipc.c

@@ -32 +32 @@
 
 
-static int ipc_master_cmd_client( irc_t *data, char **cmd )
+static void ipc_master_cmd_client( irc_t *data, char **cmd )
 {
         struct bitlbee_child *child = (void*) data;
@@ -45 +45 @@
         ipc_to_children_str( "OPERMSG :Client connecting (PID=%d): %s@%s (%s)\r\n",
                              child ? child->pid : -1, cmd[2], cmd[1], cmd[3] );
-        
-        return 1;
-}
-
-static int ipc_master_cmd_die( irc_t *data, char **cmd )
+}
+
+static void ipc_master_cmd_die( irc_t *data, char **cmd )
 {
         if( global.conf->runmode == RUNMODE_FORKDAEMON )
@@ -55 +53 @@
         
         bitlbee_shutdown( NULL );
-        
-        return 1;
-}
-
-int ipc_master_cmd_rehash( irc_t *data, char **cmd )
+}
+
+void ipc_master_cmd_rehash( irc_t *data, char **cmd )
 {
         runmode_t oldmode;
@@ -76 +72 @@
         if( global.conf->runmode == RUNMODE_FORKDAEMON )
                 ipc_to_children( cmd );
-        
-        return 1;
 }
 
@@ -92 +86 @@
 
 
-static int ipc_child_cmd_die( irc_t *irc, char **cmd )
-{
-        if( irc->status >= USTATUS_LOGGED_IN )
-                irc_write( irc, "ERROR :Operator requested server shutdown, bye bye!" );
-        
-        irc_abort( irc );
-        
-        return 1;
-}
-
-static int ipc_child_cmd_wallops( irc_t *irc, char **cmd )
+static void ipc_child_cmd_die( irc_t *irc, char **cmd )
+{
+        irc_abort( irc, 1, "Shutdown requested by operator" );
+}
+
+static void ipc_child_cmd_wallops( irc_t *irc, char **cmd )
 {
         if( irc->status < USTATUS_LOGGED_IN )
-                return 1;
+                return;
         
         if( strchr( irc->umode, 'w' ) )
                 irc_write( irc, ":%s WALLOPS :%s", irc->myhost, cmd[1] );
-        
-        return 1;
-}
-
-static int ipc_child_cmd_lilo( irc_t *irc, char **cmd )
+}
+
+static void ipc_child_cmd_lilo( irc_t *irc, char **cmd )
 {
         if( irc->status < USTATUS_LOGGED_IN )
-                return 1;
+                return;
         
         if( strchr( irc->umode, 's' ) )
                 irc_write( irc, ":%s NOTICE %s :%s", irc->myhost, irc->nick, cmd[1] );
-        
-        return 1;
-}
-
-static int ipc_child_cmd_opermsg( irc_t *irc, char **cmd )
+}
+
+static void ipc_child_cmd_opermsg( irc_t *irc, char **cmd )
 {
         if( irc->status < USTATUS_LOGGED_IN )
-                return 1;
+                return;
         
         if( strchr( irc->umode, 'o' ) )
                 irc_write( irc, ":%s NOTICE %s :*** OperMsg *** %s", irc->myhost, irc->nick, cmd[1] );
-        
-        return 1;
-}
-
-static int ipc_child_cmd_rehash( irc_t *irc, char **cmd )
+}
+
+static void ipc_child_cmd_rehash( irc_t *irc, char **cmd )
 {
         runmode_t oldmode;
@@ -145 +128 @@
         
         global.conf->runmode = oldmode;
-        
-        return 1;
-}
-
-static int ipc_child_cmd_kill( irc_t *irc, char **cmd )
+}
+
+static void ipc_child_cmd_kill( irc_t *irc, char **cmd )
 {
         if( irc->status < USTATUS_LOGGED_IN )
-                return 1;
+                return;
         
         if( nick_cmp( cmd[1], irc->nick ) != 0 )
-                return 1;       /* It's not for us. */
+                return;         /* It's not for us. */
         
         irc_write( irc, ":%s!%s@%s KILL %s :%s", irc->mynick, irc->mynick, irc->myhost, irc->nick, cmd[2] );
-        irc_abort( irc );
-        /* g_io_channel_close( irc->io_channel ); */
-        
-        return 0;
+        irc_abort( irc, 0, "Killed by operator: %s", cmd[2] );
 }
 

ipc.h

@@ -52 +52 @@
 
 /* We need this function in inetd mode, so let's just make it non-static. */
-int ipc_master_cmd_rehash( irc_t *data, char **cmd );
+void ipc_master_cmd_rehash( irc_t *data, char **cmd );
 
 

irc.c

@@ -152 +152 @@
 }
 
+/* immed=1 makes this function pretty much equal to irc_free(), except that
+   this one will "log". In case the connection is already broken and we
+   shouldn't try to write to it. */
 void irc_abort( irc_t *irc, int immed, char *format, ... )
 {
-        va_list params;
-        
         if( format != NULL )
         {
+                va_list params;
                 char *reason;
                 
                 va_start( params, format );
-                reason = g_strdup_printf( format, params );
+                reason = g_strdup_vprintf( format, params );
                 va_end( params );
                 
@@ -168 +170 @@
                 
                 ipc_to_master_str( "OPERMSG :Client exiting: %s@%s [%s]\r\n",
-                                   irc->nick, irc->host, reason" );
+                                   irc->nick ? irc->nick : "(NONE)", irc->host, reason );
                 
                 g_free( reason );
@@ -178 +180 @@
                 
                 ipc_to_master_str( "OPERMSG :Client exiting: %s@%s [%s]\r\n",
-                                   irc->nick, irc->host, "No reason given" );
+                                   irc->nick ? irc->nick : "(NONE)", irc->host, "No reason given" );
         }
         
@@ -339 +341 @@
 }
 
-int irc_process( irc_t *irc )
+void irc_process( irc_t *irc )
 {
         char **lines, *temp, **cmd;
@@ -361 +363 @@
                         if( ( cmd = irc_parse_line( lines[i] ) ) == NULL )
                                 continue;
-                        if( !irc_exec( irc, cmd ) )
-                        {
-                                g_free( cmd );
-                                g_free( lines );
-                                return 0;
-                        }
+                        irc_exec( irc, cmd );
                         
                         g_free( cmd );
+                        
+                        /* Shouldn't really happen, but just in case... */
+                        if( !g_slist_find( irc_connection_list, irc ) )
+                        {
+                                g_free( lines );
+                                return;
+                        }
                 }
                 
@@ -379 +383 @@
                 g_free( lines );
         }
-        
-        return 1;       
 }
 
@@ -972 +974 @@
                 
                 if( u->send_handler )
-                        return( u->send_handler( irc, u, s, flags ) );
+                {
+                        u->send_handler( irc, u, s, flags );
+                        return 1;
+                }
         }
         else if( c && c->gc && c->gc->prpl )
@@ -998 +1003 @@
 }
 
-int buddy_send_handler( irc_t *irc, user_t *u, char *msg, int flags )
-{
-        if( !u || !u->gc ) return( 0 );
+void buddy_send_handler( irc_t *irc, user_t *u, char *msg, int flags )
+{
+        if( !u || !u->gc ) return;
         
         if( set_getint( irc, "buddy_sendbuffer" ) && set_getint( irc, "buddy_sendbuffer_delay" ) > 0 )
@@ -1036 +1041 @@
                         g_source_remove( u->sendbuf_timer );
                 u->sendbuf_timer = g_timeout_add( delay, buddy_send_handler_delayed, u );
-                
-                return( 1 );
         }
         else
         {
-                return( serv_send_im( irc, u, msg, flags ) );
+                serv_send_im( irc, u, msg, flags );
         }
 }
@@ -1146 +1149 @@
         if( rv > 0 )
         {
-                irc_abort( irc, "ERROR :Closing Link: Ping Timeout: %d seconds", rv );
+                irc_abort( irc, 0, "Ping Timeout: %d seconds", rv );
                 return FALSE;
         }

irc.h

@@ -108 +108 @@
 void irc_free( irc_t *irc );
 
-int irc_exec( irc_t *irc, char **cmd );
-int irc_process( irc_t *irc );
+void irc_exec( irc_t *irc, char **cmd );
+void irc_process( irc_t *irc );
 char **irc_parse_line( char *line );
 char *irc_build_line( char **cmd );
@@ -134 +134 @@
 void irc_invite( irc_t *irc, char *nick, char *channel );
 void irc_whois( irc_t *irc, char *nick );
-int irc_away( irc_t *irc, char *away );
 void irc_setpass( irc_t *irc, const char *pass ); /* USE WITH CAUTION! */
 
@@ -142 +141 @@
 int irc_noticefrom( irc_t *irc, char *nick, char *msg );
 
-int buddy_send_handler( irc_t *irc, user_t *u, char *msg, int flags );
+void buddy_send_handler( irc_t *irc, user_t *u, char *msg, int flags );
 
 #endif

irc_commands.c

@@ -28 +28 @@
 #include "ipc.h"
 
-static int irc_cmd_pass( irc_t *irc, char **cmd )
+static void irc_cmd_pass( irc_t *irc, char **cmd )
 {
         if( global.conf->auth_pass && strcmp( cmd[1], global.conf->auth_pass ) == 0 )
@@ -39 +39 @@
                 irc_reply( irc, 464, ":Incorrect password" );
         }
-        
-        return( 1 );
-}
-
-static int irc_cmd_user( irc_t *irc, char **cmd )
+}
+
+static void irc_cmd_user( irc_t *irc, char **cmd )
 {
         irc->user = g_strdup( cmd[1] );
@@ -49 +47 @@
         
         irc_check_login( irc );
-        
-        return( 1 );
-}
-
-static int irc_cmd_nick( irc_t *irc, char **cmd )
+}
+
+static void irc_cmd_nick( irc_t *irc, char **cmd )
 {
         if( irc->nick )
@@ -75 +71 @@
                 irc_check_login( irc );
         }
-        
-        return( 1 );
-}
-
-static int irc_cmd_quit( irc_t *irc, char **cmd )
-{
-        irc_write( irc, "ERROR :%s%s", cmd[1]?"Quit: ":"", cmd[1]?cmd[1]:"Client Quit" );
-        /* g_io_channel_close( irc->io_channel ); */
-        
-        return( 0 );
-}
-
-static int irc_cmd_ping( irc_t *irc, char **cmd )
+}
+
+static void irc_cmd_quit( irc_t *irc, char **cmd )
+{
+        if( cmd[1] && *cmd[1] )
+                irc_abort( irc, 0, "Quit: %s", cmd[1] );
+        else
+                irc_abort( irc, 0, "Leaving..." );
+}
+
+static void irc_cmd_ping( irc_t *irc, char **cmd )
 {
         irc_write( irc, ":%s PONG %s :%s", irc->myhost, irc->myhost, cmd[1]?cmd[1]:irc->myhost );
-        
-        return( 1 );
-}
-
-static int irc_cmd_oper( irc_t *irc, char **cmd )
+}
+
+static void irc_cmd_oper( irc_t *irc, char **cmd )
 {
         if( global.conf->oper_pass && strcmp( cmd[2], global.conf->oper_pass ) == 0 )
@@ -105 +97 @@
                 irc_reply( irc, 432, ":Incorrect password" );
         }
-        
-        return( 1 );
-}
-
-static int irc_cmd_mode( irc_t *irc, char **cmd )
+}
+
+static void irc_cmd_mode( irc_t *irc, char **cmd )
 {
         if( *cmd[1] == '#' || *cmd[1] == '&' )
@@ -133 +123 @@
                         irc_reply( irc, 502, ":Don't touch their modes" );
         }
-        
-        return( 1 );
-}
-
-static int irc_cmd_names( irc_t *irc, char **cmd )
+}
+
+static void irc_cmd_names( irc_t *irc, char **cmd )
 {
         irc_names( irc, cmd[1]?cmd[1]:irc->channel );
-        
-        return( 1 );
-}
-
-static int irc_cmd_part( irc_t *irc, char **cmd )
+}
+
+static void irc_cmd_part( irc_t *irc, char **cmd )
 {
         struct conversation *c;
@@ -172 +158 @@
                 irc_reply( irc, 403, "%s :No such channel", cmd[1] );
         }
-        
-        return( 1 );
-}
-
-static int irc_cmd_join( irc_t *irc, char **cmd )
+}
+
+static void irc_cmd_join( irc_t *irc, char **cmd )
 {
         if( g_strcasecmp( cmd[1], irc->channel ) == 0 )
@@ -210 +194 @@
                 }
         }
-        
-        return( 1 );
-}
-
-static int irc_cmd_invite( irc_t *irc, char **cmd )
+}
+
+static void irc_cmd_invite( irc_t *irc, char **cmd )
 {
         char *nick = cmd[1], *channel = cmd[2];
@@ -225 +207 @@
                         c->gc->prpl->chat_invite( c->gc, c->id, "", u->handle );
                         irc_reply( irc, 341, "%s %s", nick, channel );
-                        return( 1 );
+                        return;
                 }
         
         irc_reply( irc, 482, "%s :Invite impossible; User/Channel non-existent or incompatible", channel );
-        
-        return( 1 );
-}
-
-static int irc_cmd_privmsg( irc_t *irc, char **cmd )
+}
+
+static void irc_cmd_privmsg( irc_t *irc, char **cmd )
 {
         if ( !cmd[2] ) 
@@ -283 +263 @@
                 irc_send( irc, cmd[1], cmd[2], ( g_strcasecmp( cmd[0], "NOTICE" ) == 0 ) ? IM_FLAG_AWAY : 0 );
         }
-        
-        return( 1 );
-}
-
-static int irc_cmd_who( irc_t *irc, char **cmd )
+}
+
+static void irc_cmd_who( irc_t *irc, char **cmd )
 {
         char *channel = cmd[1];
@@ -317 +295 @@
         
         irc_reply( irc, 315, "%s :End of /WHO list", channel?channel:"**" );
-        
-        return( 1 );
-}
-
-static int irc_cmd_userhost( irc_t *irc, char **cmd )
+}
+
+static void irc_cmd_userhost( irc_t *irc, char **cmd )
 {
         user_t *u;
@@ -340 +316 @@
                                 irc_reply( irc, 302, ":%s=+%s@%s", u->nick, u->user, u->host );
                 }
-        
-        return( 1 );
-}
-
-static int irc_cmd_ison( irc_t *irc, char **cmd )
+}
+
+static void irc_cmd_ison( irc_t *irc, char **cmd )
 {
         user_t *u;
@@ -383 +357 @@
         
         irc_reply( irc, 303, ":%s", buff );
-        
-        return( 1 );
-}
-
-static int irc_cmd_watch( irc_t *irc, char **cmd )
+}
+
+static void irc_cmd_watch( irc_t *irc, char **cmd )
 {
         int i;
@@ -430 +402 @@
                 }
         }
-        
-        return( 1 );
-}
-
-static int irc_cmd_topic( irc_t *irc, char **cmd )
+}
+
+static void irc_cmd_topic( irc_t *irc, char **cmd )
 {
         if( cmd[2] )
@@ -440 +410 @@
         else
                 irc_topic( irc, cmd[1] );
-        
-        return( 1 );
-}
-
-static int irc_cmd_away( irc_t *irc, char **cmd )
+}
+
+static void irc_cmd_away( irc_t *irc, char **cmd )
 {
         user_t *u = user_find( irc, irc->nick );
@@ -450 +418 @@
         char *away = cmd[1];
         
-        if( !u ) return( 1 );
+        if( !u ) return;
         
         if( away && *away )
@@ -482 +450 @@
                 c = c->next;
         }
-        
-        return( 1 );
-}
-
-static int irc_cmd_whois( irc_t *irc, char **cmd )
+}
+
+static void irc_cmd_whois( irc_t *irc, char **cmd )
 {
         char *nick = cmd[1];
@@ -512 +478 @@
                 irc_reply( irc, 401, "%s :Nick does not exist", nick );
         }
-        
-        return( 1 );
-}
-
-static int irc_cmd_whowas( irc_t *irc, char **cmd )
+}
+
+static void irc_cmd_whowas( irc_t *irc, char **cmd )
 {
         /* For some reason irssi tries a whowas when whois fails. We can
@@ -525 +489 @@
         irc_reply( irc, 406, "%s :Nick does not exist", cmd[1] );
         irc_reply( irc, 369, "%s :End of WHOWAS", cmd[1] );
-        
-        return( 1 );
-}
-
-static int irc_cmd_nickserv( irc_t *irc, char **cmd )
+}
+
+static void irc_cmd_nickserv( irc_t *irc, char **cmd )
 {
         /* [SH] This aliases the NickServ command to PRIVMSG root */
         /* [TV] This aliases the NS command to PRIVMSG root as well */
         root_command( irc, cmd + 1 );
-        
-        return( 1 );
-}
-
-static int irc_cmd_motd( irc_t *irc, char **cmd )
+}
+
+static void irc_cmd_motd( irc_t *irc, char **cmd )
 {
         irc_motd( irc );
-        
-        return( 1 );
-}
-
-static int irc_cmd_pong( irc_t *irc, char **cmd )
+}
+
+static void irc_cmd_pong( irc_t *irc, char **cmd )
 {
         /* We could check the value we get back from the user, but in
@@ -551 +509 @@
         irc->last_pong = gettime();
         irc->pinging = 0;
-        
-        return( 1 );
-}
-
-static int irc_cmd_completions( irc_t *irc, char **cmd )
+}
+
+static void irc_cmd_completions( irc_t *irc, char **cmd )
 {
         user_t *u = user_find( irc, irc->mynick );
@@ -574 +530 @@
         
         irc_privmsg( irc, u, "NOTICE", irc->nick, "COMPLETIONS ", "END" );
-        
-        return( 1 );
-}
-
-static int irc_cmd_rehash( irc_t *irc, char **cmd )
+}
+
+static void irc_cmd_rehash( irc_t *irc, char **cmd )
 {
         if( global.conf->runmode == RUNMODE_INETD )
@@ -586 +540 @@
         
         irc_reply( irc, 382, "%s :Rehashing", CONF_FILE );
-        
-        return( 1 );
 }
 
@@ -625 +577 @@
 };
 
-int irc_exec( irc_t *irc, char *cmd[] )
+void irc_exec( irc_t *irc, char *cmd[] )
 {       
-        int i, j;
+        int i;
         
         if( !cmd[0] )
-                return( 1 );
+                return;
         
         for( i = 0; irc_commands[i].command; i++ )
@@ -638 +590 @@
                         {
                                 irc_reply( irc, 462, ":Only allowed before logging in" );
-                                return( 1 );
-                        }
-                        if( irc_commands[i].flags & IRC_CMD_LOGGED_IN && irc->status < USTATUS_LOGGED_IN )
+                        }
+                        else if( irc_commands[i].flags & IRC_CMD_LOGGED_IN && irc->status < USTATUS_LOGGED_IN )
                         {
                                 irc_reply( irc, 451, ":Register first" );
-                                return( 1 );
-                        }
-                        if( irc_commands[i].flags & IRC_CMD_OPER_ONLY && !strchr( irc->umode, 'o' ) )
+                        }
+                        else if( irc_commands[i].flags & IRC_CMD_OPER_ONLY && !strchr( irc->umode, 'o' ) )
                         {
                                 irc_reply( irc, 481, ":Permission denied - You're not an IRC operator" );
-                                return( 1 );
-                        }
-                        
-                        for( j = 1; j <= irc_commands[i].required_parameters; j ++ )
-                                if( !cmd[j] )
-                                {
-                                        irc_reply( irc, 461, "%s :Need more parameters", cmd[0] );
-                                        return( 1 );
-                                }
-                        
-                        if( irc_commands[i].flags & IRC_CMD_TO_MASTER )
+                        }
+                        else if( !cmd[irc_commands[i].required_parameters] )
+                        {
+                                irc_reply( irc, 461, "%s :Need more parameters", cmd[0] );
+                        }
+                        else if( irc_commands[i].flags & IRC_CMD_TO_MASTER )
+                        {
                                 /* IPC doesn't make sense in inetd mode,
                                     but the function will catch that. */
                                 ipc_to_master( cmd );
+                        }
                         else
-                                return irc_commands[i].execute( irc, cmd );
-                }
-        
-        return( 1 );
-}
+                        {
+                                irc_commands[i].execute( irc, cmd );
+                        }
+                        
+                        break;
+                }
+}

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 );
 }
 

user.h

@@ -45 +45 @@
         int sendbuf_flags;
         
-        int (*send_handler) ( irc_t *irc, struct __USER *u, char *msg, int flags );
+        void (*send_handler) ( irc_t *irc, struct __USER *u, char *msg, int flags );
         
         struct __USER *next;