diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-05-30 21:51:29 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-05-30 21:51:29 +0900 |
commit | e47dbece39712567a36a096010c5c1223119f7e3 (patch) | |
tree | aced74e797a0c37931e367574bdd60cbfb63e0f4 /argv-array.c | |
parent | Merge branch 'bc/hash-independent-tests' (diff) | |
parent | unpack_trees_options: free messages when done (diff) | |
download | tgif-e47dbece39712567a36a096010c5c1223119f7e3.tar.xz |
Merge branch 'ma/unpack-trees-free-msgs'
Leak plugging.
* ma/unpack-trees-free-msgs:
unpack_trees_options: free messages when done
argv-array: return the pushed string from argv_push*()
merge-recursive: provide pair of `unpack_trees_{start,finish}()`
merge: setup `opts` later in `checkout_fast_forward()`
Diffstat (limited to 'argv-array.c')
-rw-r--r-- | argv-array.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/argv-array.c b/argv-array.c index cb5bcd2c06..f352ea9357 100644 --- a/argv-array.c +++ b/argv-array.c @@ -21,12 +21,13 @@ static void argv_array_push_nodup(struct argv_array *array, const char *value) array->argv[array->argc] = NULL; } -void argv_array_push(struct argv_array *array, const char *value) +const char *argv_array_push(struct argv_array *array, const char *value) { argv_array_push_nodup(array, xstrdup(value)); + return array->argv[array->argc - 1]; } -void argv_array_pushf(struct argv_array *array, const char *fmt, ...) +const char *argv_array_pushf(struct argv_array *array, const char *fmt, ...) { va_list ap; struct strbuf v = STRBUF_INIT; @@ -36,6 +37,7 @@ void argv_array_pushf(struct argv_array *array, const char *fmt, ...) va_end(ap); argv_array_push_nodup(array, strbuf_detach(&v, NULL)); + return array->argv[array->argc - 1]; } void argv_array_pushl(struct argv_array *array, ...) |