Changeset 3b99524

Timestamp:

2008-08-31T15:41:51Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

07054a5

Parents:

3611717

Message:

Added a MIN_ARGS() macro instead of stupidly copy-pasting the same
if-statement ten times.

File:

• root_commands.c (modified) (9 diffs)

root_commands.c

@@ -78 +78 @@
 }
 
+#define MIN_ARGS( x, y... )                                                    \
+        do                                                                     \
+        {                                                                      \
+                int i;                                                         \
+                for( i = 1; i <= x; i ++ )                                     \
+                        if( cmd[i] == NULL )                                   \
+                        {                                                      \
+                                irc_usermsg( irc, "Not enough parameters given (need %d).", x ); \
+                                return y;                                      \
+                        }                                                      \
+        } while( 0 )
+
 void root_command( irc_t *irc, char *cmd[] )
 {       
@@ -88 +100 @@
                 if( g_strcasecmp( commands[i].command, cmd[0] ) == 0 )
                 {
-                        if( !cmd[commands[i].required_parameters] )
-                        {
-                                irc_usermsg( irc, "Not enough parameters given (need %d)", commands[i].required_parameters );
-                                return;
-                        }
+                        MIN_ARGS( commands[i].required_parameters );
+                        
                         commands[i].execute( irc, cmd );
                         return;
@@ -270 +279 @@
                 char *id;
                 
-                if( !set_full )
-                {
-                        /* FIXME: Broken # */
-                        irc_usermsg( irc, "Not enough parameters given (need %d)", 3 );
-                        return 0;
-                }
+                MIN_ARGS( 3, 0 );
         
                 if( ( tmp = strchr( set_full, '/' ) ) )
@@ -374 +378 @@
                 struct prpl *prpl;
                 
-                if( cmd[2] == NULL || cmd[3] == NULL || cmd[4] == NULL )
-                {
-                        irc_usermsg( irc, "Not enough parameters" );
-                        return;
-                }
+                MIN_ARGS( 4 );
                 
                 prpl = find_protocol( cmd[2] );
@@ -400 +400 @@
         else if( g_strcasecmp( cmd[1], "del" ) == 0 )
         {
-                if( !cmd[2] )
-                {
-                        irc_usermsg( irc, "Not enough parameters given (need %d)", 2 );
-                }
-                else if( !( a = account_get( irc, cmd[2] ) ) )
+                MIN_ARGS( 2 );
+
+                if( !( a = account_get( irc, cmd[2] ) ) )
                 {
                         irc_usermsg( irc, "Invalid account" );
@@ -532 +530 @@
         else if( g_strcasecmp( cmd[1], "set" ) == 0 )
         {
-                if( !cmd[2] )
-                {
-                        irc_usermsg( irc, "Not enough parameters given (need %d)", 2 );
-                        return;
-                }
+                MIN_ARGS( 2 );
                 
                 cmd_set_real( irc, cmd + 1, cmd_account_set_findhead );
@@ -1014 +1008 @@
         if( g_strcasecmp( cmd[1], "add" ) == 0 )
         {
-                if( !( cmd[2] && cmd[3] && cmd[4] ) )
-                {
-                        irc_usermsg( irc, "Not enough parameters given (need %d)", 4 );
-                        return;
-                }
+                MIN_ARGS( 4 );
                 
                 if( !( acc = account_get( irc, cmd[2] ) ) )
@@ -1053 +1043 @@
         else if( g_strcasecmp( cmd[1], "del" ) == 0 )
         {
-                if( !cmd[2] )
-                {
-                        irc_usermsg( irc, "Not enough parameters given (need %d)", 2 );
-                        return;
-                }
+                MIN_ARGS( 2 );
                 
                 if( ( c = chat_get( irc, cmd[2] ) ) )
@@ -1071 +1057 @@
         {
                 user_t *u;
-
-                if( !cmd[2] )
-                {
-                        irc_usermsg( irc, "Not enough parameters given (need %d)", 2 );
-                        return;
-                }
+                
+                MIN_ARGS( 2 );
                 
                 if( ( u = user_find( irc, cmd[2] ) ) && u->ic && u->ic->acc->prpl->chat_with )