summaryrefslogtreecommitdiff
path: root/argv-array.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2012-04-18 21:08:49 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-04-18 23:16:16 (GMT)
commitfd93d2e60ea66fc3796904ff53ead3ef4755b137 (patch)
treed232fa1ceb208c5e16eff70a4efecb778c7c2e87 /argv-array.c
parent7e52f5660e542cf801e8fc6902a30cc572c13736 (diff)
downloadgit-fd93d2e60ea66fc3796904ff53ead3ef4755b137.zip
git-fd93d2e60ea66fc3796904ff53ead3ef4755b137.tar.gz
git-fd93d2e60ea66fc3796904ff53ead3ef4755b137.tar.bz2
argv-array: refactor empty_argv initialization
An empty argv-array is initialized to point to a static empty NULL-terminated array. The original implementation separates the actual storage of the NULL-terminator from the pointer to the list. This makes the exposed type a "const char **", which nicely matches the type stored by the argv-array. However, this indirection means that one cannot use empty_argv to initialize a static variable, since it is not a constant. Instead, we can expose empty_argv directly, as an array of pointers. The only place we use it is in the ARGV_ARRAY_INIT initializer, and it decays to a pointer appropriately there. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'argv-array.c')
-rw-r--r--argv-array.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/argv-array.c b/argv-array.c
index a4e0420..110a61b 100644
--- a/argv-array.c
+++ b/argv-array.c
@@ -2,8 +2,7 @@
#include "argv-array.h"
#include "strbuf.h"
-static const char *empty_argv_storage = NULL;
-const char **empty_argv = &empty_argv_storage;
+const char *empty_argv[] = { NULL };
void argv_array_init(struct argv_array *array)
{