[PATCH 1/3] argv-array: refactor empty_argv initialization
- From
Jeff King <peff@peff.net>
- Date
- Apr 18, 2012, 21:08 UTC
- Message-ID
- <20120418210848.GA21301@sigill.intra.peff.net>
- In-Reply-To
- <20120418210740.GA21214@sigill.intra.peff.net>
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> --- argv-array.c | 3 +-- argv-array.h | 2 +- 2 files changed, 2 insertions(+), 3 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) { diff --git a/argv-array.h b/argv-array.h index 74dd2b1..c45c698 100644 --- a/argv-array.h +++ b/argv-array.h @@ -1,7 +1,7 @@ #ifndef ARGV_ARRAY_H #define ARGV_ARRAY_H -extern const char **empty_argv; +extern const char *empty_argv[]; struct argv_array { const char **argv;
-- 1.7.9.6.8.g992e5