{"thread":{"id":"7176","subject":"[PATCH 2/8] Remove unused run_command variants","startedAt":"2007-03-10T08:27:52Z","lastAt":"2007-03-10T08:27:52Z","messageCount":1,"participants":["Shawn O. Pearce"],"isPatch":true,"patchVersion":1,"patchTotal":8},"messages":[{"id":"36734","messageId":"20070310082752.GB4133@spearce.org","threadId":"7176","inReplyTo":null,"subject":"[PATCH 2/8] Remove unused run_command variants","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2007-03-10T08:27:52Z","receivedAt":"2007-03-10T08:27:52Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"We don't actually use these va_list based variants of run_command\nanymore.  I'm removing them before I make further improvements.\n\nSigned-off-by: Shawn O. Pearce <spearce@spearce.org>\n---\n\n This and the remaining patches are on top of master.\n\n builtin-push.c |    2 +-\n run-command.c  |   45 ---------------------------------------------\n run-command.h  |    4 ----\n 3 files changed, 1 insertions(+), 50 deletions(-)\n\ndiff --git a/builtin-push.c b/builtin-push.c\nindex 979efcc..6ab9a28 100644\n--- a/builtin-push.c\n+++ b/builtin-push.c\n@@ -336,7 +336,7 @@ static int do_push(const char *repo)\n \t\targv[dest_argc] = NULL;\n \t\tif (verbose)\n \t\t\tfprintf(stderr, \"Pushing to %s\\n\", dest);\n-\t\terr = run_command_v(argv);\n+\t\terr = run_command_v_opt(argv, 0);\n \t\tif (!err)\n \t\t\tcontinue;\n \t\tswitch (err) {\ndiff --git a/run-command.c b/run-command.c\nindex cfbad74..94ace50 100644\n--- a/run-command.c\n+++ b/run-command.c\n@@ -46,48 +46,3 @@ int run_command_v_opt(const char **argv, int flags)\n \t\treturn 0;\n \t}\n }\n-\n-int run_command_v(const char **argv)\n-{\n-\treturn run_command_v_opt(argv, 0);\n-}\n-\n-static int run_command_va_opt(int opt, const char *cmd, va_list param)\n-{\n-\tint argc;\n-\tconst char *argv[MAX_RUN_COMMAND_ARGS];\n-\tconst char *arg;\n-\n-\targv[0] = (char*) cmd;\n-\targc = 1;\n-\twhile (argc < MAX_RUN_COMMAND_ARGS) {\n-\t\targ = argv[argc++] = va_arg(param, char *);\n-\t\tif (!arg)\n-\t\t\tbreak;\n-\t}\n-\tif (MAX_RUN_COMMAND_ARGS <= argc)\n-\t\treturn error(\"too many args to run %s\", cmd);\n-\treturn run_command_v_opt(argv, opt);\n-}\n-\n-int run_command_opt(int opt, const char *cmd, ...)\n-{\n-\tva_list params;\n-\tint r;\n-\n-\tva_start(params, cmd);\n-\tr = run_command_va_opt(opt, cmd, params);\n-\tva_end(params);\n-\treturn r;\n-}\n-\n-int run_command(const char *cmd, ...)\n-{\n-\tva_list params;\n-\tint r;\n-\n-\tva_start(params, cmd);\n-\tr = run_command_va_opt(0, cmd, params);\n-\tva_end(params);\n-\treturn r;\n-}\ndiff --git a/run-command.h b/run-command.h\nindex 59c4476..2646d38 100644\n--- a/run-command.h\n+++ b/run-command.h\n@@ -1,7 +1,6 @@\n #ifndef RUN_COMMAND_H\n #define RUN_COMMAND_H\n \n-#define MAX_RUN_COMMAND_ARGS 256\n enum {\n \tERR_RUN_COMMAND_FORK = 10000,\n \tERR_RUN_COMMAND_EXEC,\n@@ -15,8 +14,5 @@ enum {\n #define RUN_GIT_CMD\t     2\t/*If this is to be git sub-command */\n #define RUN_COMMAND_STDOUT_TO_STDERR 4\n int run_command_v_opt(const char **argv, int opt);\n-int run_command_v(const char **argv);\n-int run_command_opt(int opt, const char *cmd, ...);\n-int run_command(const char *cmd, ...);\n \n #endif\n-- \n1.5.0.3.942.g299f\n"}]}