summaryrefslogtreecommitdiff
path: root/builtin/annotate.c
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2014-07-16 08:51:33 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-07-16 18:10:11 (GMT)
commit8c2cfa55446f542454eb4acc7f49d1747e425c94 (patch)
treecdb357d0fae79890827c6e488cbed69eef837fe6 /builtin/annotate.c
parent45067fc973c31953ab283f77f0f91eba9a272624 (diff)
downloadgit-8c2cfa55446f542454eb4acc7f49d1747e425c94.zip
git-8c2cfa55446f542454eb4acc7f49d1747e425c94.tar.gz
git-8c2cfa55446f542454eb4acc7f49d1747e425c94.tar.bz2
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>
Diffstat (limited to 'builtin/annotate.c')
-rw-r--r--builtin/annotate.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/builtin/annotate.c b/builtin/annotate.c
index fc43eed..da413ae 100644
--- a/builtin/annotate.c
+++ b/builtin/annotate.c
@@ -5,20 +5,18 @@
*/
#include "git-compat-util.h"
#include "builtin.h"
+#include "argv-array.h"
int cmd_annotate(int argc, const char **argv, const char *prefix)
{
- const char **nargv;
+ struct argv_array args = ARGV_ARRAY_INIT;
int i;
- nargv = xmalloc(sizeof(char *) * (argc + 2));
- nargv[0] = "annotate";
- nargv[1] = "-c";
+ argv_array_pushl(&args, "annotate", "-c", NULL);
for (i = 1; i < argc; i++) {
- nargv[i+1] = argv[i];
+ argv_array_push(&args, argv[i]);
}
- nargv[argc + 1] = NULL;
- return cmd_blame(argc + 1, nargv, prefix);
+ return cmd_blame(args.argc, args.argv, prefix);
}