cmd: inline Cmd_Arg* helper funcs in all compilation units

ea7ad935aa214b3a52eb7079110e992fbfe750ee should have done this.

Signed-off-by: bones_was_here <bones_was_here@xonotic.au>

diff --git a/cmd.c b/cmd.c
index c73a7c6e1c2efbdbdb8107a65ed4af45599bff06..5315d48d005ba911f6fcdd68365d08856ff619bd 100644 (file)
--- a/cmd.c
+++ b/cmd.c
@@ -1706,38 +1706,6 @@ void Cmd_Shutdown(void)
        }
 }
 
-/*
-============
-Cmd_Argc
-============
-*/
-inline int Cmd_Argc (cmd_state_t *cmd)
-{
-       return cmd->argc;
-}
-
-/*
-============
-Cmd_Argv
-============
-*/
-inline const char *Cmd_Argv(cmd_state_t *cmd, int arg)
-{
-       if (arg >= cmd->argc )
-               return cmd->null_string;
-       return cmd->argv[arg];
-}
-
-/*
-============
-Cmd_Args
-============
-*/
-inline const char *Cmd_Args (cmd_state_t *cmd)
-{
-       return cmd->args;
-}
-
 /*
 ============
 Cmd_TokenizeString

diff --git a/cmd.h b/cmd.h
index b3502919ab766fb74a1ac6989e72f7bea130e2a3..a1cd89e7218aa987739a2055b437911c0b60417a 100644 (file)
--- a/cmd.h
+++ b/cmd.h
@@ -250,15 +250,25 @@ const char *Cmd_CompleteAlias (cmd_state_t *cmd, const char *partial);
 void Cmd_CompleteAliasPrint (cmd_state_t *cmd, const char *partial);
 
 // Enhanced console completion by Fett erich@heintz.com
-
 // Added by EvilTypeGuy eviltypeguy@qeradiant.com
 
-int Cmd_Argc (cmd_state_t *cmd);
-const char *Cmd_Argv (cmd_state_t *cmd, int arg);
-const char *Cmd_Args (cmd_state_t *cmd);
 // The functions that execute commands get their parameters with these
 // functions. Cmd_Argv(cmd, ) will return an empty string, not a NULL
 // if arg > argc, so string operations are always safe.
+static inline int Cmd_Argc (cmd_state_t *cmd)
+{
+       return cmd->argc;
+}
+static inline const char *Cmd_Argv(cmd_state_t *cmd, int arg)
+{
+       if (arg >= cmd->argc )
+               return cmd->null_string;
+       return cmd->argv[arg];
+}
+static inline const char *Cmd_Args (cmd_state_t *cmd)
+{
+       return cmd->args;
+}
 
 /// Returns the position (1 to argc-1) in the command's argument list
 /// where the given parameter apears, or 0 if not present