[PATCH 1/2] argv-array: add pop function
- From
Jeff King <peff@peff.net>
- Date
- Sep 1, 2012, 11:25 UTC
- Message-ID
- <20120901112527.GA19163@sigill.intra.peff.net>
- In-Reply-To
- <20120901112251.GA11445@sigill.intra.peff.net>
Sometimes we build a set of similar command lines, differing only in the final arguments (e.g., "fetch --multiple"). To use argv_array for this, you have to either push the same set of elements repeatedly, or break the abstraction by manually manipulating the array's internal members.
Instead, let's provide a sanctioned "pop" function to remove elements from the end.
Signed-off-by: Jeff King <peff@peff.net> --- Documentation/technical/api-argv-array.txt | 4 ++++ argv-array.c | 9 +++++++++ argv-array.h | 1 + 3 files changed, 14 insertions(+)
diff --git a/Documentation/technical/api-argv-array.txt b/Documentation/technical/api-argv-array.txt index 1b7d8f1..1a79781 100644 --- a/Documentation/technical/api-argv-array.txt +++ b/Documentation/technical/api-argv-array.txt @@ -46,6 +46,10 @@ Functions Format a string and push it onto the end of the array. This is a convenience wrapper combining `strbuf_addf` and `argv_array_push`. +`argv_array_pop`:: + Remove the final element from the array. If there are no + elements in the array, do nothing. + `argv_array_clear`:: Free all memory associated with the array and return it to the initial, empty state. diff --git a/argv-array.c b/argv-array.c index 0b5f889..55e8443 100644 --- a/argv-array.c +++ b/argv-array.c @@ -49,6 +49,15 @@ void argv_array_pushl(struct argv_array *array, ...) va_end(ap); } +void argv_array_pop(struct argv_array *array) +{ + if (!array->argc) + return; + free((char *)array->argv[array->argc - 1]); + array->argv[array->argc - 1] = NULL; + array->argc--; +} + void argv_array_clear(struct argv_array *array) { if (array->argv != empty_argv) { diff --git a/argv-array.h b/argv-array.h index b93a69c..f4b9866 100644 --- a/argv-array.h +++ b/argv-array.h @@ -16,6 +16,7 @@ void argv_array_pushl(struct argv_array *, ...); __attribute__((format (printf,2,3))) void argv_array_pushf(struct argv_array *, const char *fmt, ...); void argv_array_pushl(struct argv_array *, ...); +void argv_array_pop(struct argv_array *); void argv_array_clear(struct argv_array *); #endif /* ARGV_ARRAY_H */
-- 1.7.12.rc3.8.g89db099