diff options
| author | Jeff King <peff@peff.net> | 2012-09-01 07:25:27 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-02 21:10:01 -0700 |
| commit | fe4a0a288842e225f99254b3e6ce14ff98875501 (patch) | |
| tree | c8bb6378525ac176e76472dcc58666a708845d78 | |
| parent | 9e234af281107d44116ecf31eef65de145c46d15 (diff) | |
| download | git-fe4a0a288842e225f99254b3e6ce14ff98875501.tar.gz | |
argv-array: add pop function
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/technical/api-argv-array.txt | 4 | ||||
| -rw-r--r-- | argv-array.c | 9 | ||||
| -rw-r--r-- | argv-array.h | 1 |
3 files changed, 14 insertions, 0 deletions
diff --git a/Documentation/technical/api-argv-array.txt b/Documentation/technical/api-argv-array.txt index 1b7d8f140c..1a797812fb 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 0b5f8898a1..55e8443ff9 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 b93a69c36c..f4b98660f8 100644 --- a/argv-array.h +++ b/argv-array.h @@ -16,6 +16,7 @@ void argv_array_push(struct argv_array *, const char *); __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 */ |