{"thread":{"id":"37137","subject":"[PATCH] annotate: use argv_array","startedAt":"2014-07-16T08:51:33Z","lastAt":"2014-07-16T08:51:33Z","messageCount":1,"participants":["René Scharfe"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"246151","messageId":"53C63D15.8040204@web.de","threadId":"37137","inReplyTo":null,"subject":"[PATCH] annotate: use argv_array","fromName":"René Scharfe","fromEmail":"l.s.r@web.de","sentAt":"2014-07-16T08:51:33Z","receivedAt":"2014-07-16T08:51:33Z","isPatch":true,"sender":{"key":"l.s.r@web.de","avatar":"https://avatars.githubusercontent.com/u/26122331?v=4"},"body":"Simplify the code and get rid of some magic constants by using\nargv_array to build the argument list for cmd_blame.  Be lazy and let\nthe OS release our allocated memory, as before.\n\nSigned-off-by: Rene Scharfe <l.s.r@web.de>\n---\n builtin/annotate.c | 12 +++++-------\n 1 file changed, 5 insertions(+), 7 deletions(-)\n\ndiff --git a/builtin/annotate.c b/builtin/annotate.c\nindex fc43eed..da413ae 100644\n--- a/builtin/annotate.c\n+++ b/builtin/annotate.c\n@@ -5,20 +5,18 @@\n  */\n #include \"git-compat-util.h\"\n #include \"builtin.h\"\n+#include \"argv-array.h\"\n \n int cmd_annotate(int argc, const char **argv, const char *prefix)\n {\n-\tconst char **nargv;\n+\tstruct argv_array args = ARGV_ARRAY_INIT;\n \tint i;\n-\tnargv = xmalloc(sizeof(char *) * (argc + 2));\n \n-\tnargv[0] = \"annotate\";\n-\tnargv[1] = \"-c\";\n+\targv_array_pushl(&args, \"annotate\", \"-c\", NULL);\n \n \tfor (i = 1; i < argc; i++) {\n-\t\tnargv[i+1] = argv[i];\n+\t\targv_array_push(&args, argv[i]);\n \t}\n-\tnargv[argc + 1] = NULL;\n \n-\treturn cmd_blame(argc + 1, nargv, prefix);\n+\treturn cmd_blame(args.argc, args.argv, prefix);\n }\n-- \n2.0.0\n"}]}