annotate: use argv_array
Simplify the code and get rid of some magic constants by using argv_array to build the argument list for cmd_blame. Be lazy and let the OS release our allocated memory, as before. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
René Scharfe committed
Jul 16, 2014 at 10:51 UTC
8c2cfa55446f542454eb4acc7f49d1747e425c94
1 file changed
+5
-7
builtin/annotate.c
+5
-7
@@ -5,20 +5,18 @@
5
*/
6
#include "git-compat-util.h"
7
#include "builtin.h"
8
+#include "argv-array.h"
9
10
int cmd_annotate(int argc, const char **argv, const char *prefix)
11
{
11
- const char **nargv;
12
+ struct argv_array args = ARGV_ARRAY_INIT;
13
int i;
13
- nargv = xmalloc(sizeof(char *) * (argc + 2));
14
15
- nargv[0] = "annotate";
16
- nargv[1] = "-c";
15
+ argv_array_pushl(&args, "annotate", "-c", NULL);
16
17
for (i = 1; i < argc; i++) {
19
- nargv[i+1] = argv[i];
18
+ argv_array_push(&args, argv[i]);
19
}
21
- nargv[argc + 1] = NULL;
20
23
- return cmd_blame(argc + 1, nargv, prefix);
21
+ return cmd_blame(args.argc, args.argv, prefix);
22
}