[PATCH v7 04/16] Add argv_array_detach and argv_array_free_detached
- From
Florian Achleitner <florian.achleitner.2.6.31@gmail.com>
- Date
- Aug 28, 2012, 08:49 UTC
- Message-ID
- <1346143790-23491-5-git-send-email-florian.achleitner.2.6.31@gmail.com>
- In-Reply-To
- <1346143790-23491-4-git-send-email-florian.achleitner.2.6.31@gmail.com>
Allow detaching of ownership of the argv_array's contents and add a function to free those detached argv_arrays later.
This makes it possible to use argv_array efficiently with the exiting struct child_process which only contains a member char **argv.
Add to documentation.
Signed-off-by: Florian Achleitner <florian.achleitner.2.6.31@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> --- Documentation/technical/api-argv-array.txt | 8 ++++++++ argv-array.c | 20 ++++++++++++++++++++ argv-array.h | 2 ++ 3 files changed, 30 insertions(+)
diff --git a/Documentation/technical/api-argv-array.txt b/Documentation/technical/api-argv-array.txt index 1b7d8f1..6b97d6d 100644 --- a/Documentation/technical/api-argv-array.txt +++ b/Documentation/technical/api-argv-array.txt @@ -49,3 +49,11 @@ Functions `argv_array_clear`:: Free all memory associated with the array and return it to the initial, empty state. + +`argv_array_detach`:: + Detach the argv array from the `struct argv_array`, transfering + ownership of the allocated array and strings. + +`argv_array_free_detached`:: + Free the memory allocated by a `struct argv_array` that was later + detached and is now no longer needed. diff --git a/argv-array.c b/argv-array.c index 0b5f889..aab50d6 100644 --- a/argv-array.c +++ b/argv-array.c @@ -59,3 +59,23 @@ void argv_array_clear(struct argv_array *array) } argv_array_init(array); } + +const char **argv_array_detach(struct argv_array *array, int *argc) +{ + const char **argv = + array->argv == empty_argv || array->argc == 0 ? NULL : array->argv; + if (argc) + *argc = array->argc; + argv_array_init(array); + return argv; +} + +void argv_array_free_detached(const char **argv) +{ + if (argv) { + int i; + for (i = 0; argv[i]; i++) + free((char **)argv[i]); + free(argv); + } +} diff --git a/argv-array.h b/argv-array.h index b93a69c..b3ef351 100644 --- a/argv-array.h +++ b/argv-array.h @@ -17,5 +17,7 @@ __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_clear(struct argv_array *); +const char **argv_array_detach(struct argv_array *array, int *argc); +void argv_array_free_detached(const char **argv); #endif /* ARGV_ARRAY_H */
-- 1.7.9.5