@matheusbsbs / matheus-bagliano / commits / 342c513a4a

argv-array: return the pushed string from argv_push*()

Such an API change allows us to use an argv_array this way: struct argv_array to_free = ARGV_ARRAY_INIT; const char *msg; if (some condition) { msg = "constant string message"; ... other logic ... } else { msg = argv_array_pushf(&to_free, "format %s", var); } ... use "msg" ... ... do other things ... argv_array_clear(&to_free); Note that argv_array_pushl() and argv_array_pushv() are used to push one or more strings with a single call, so we do not return any one of these strings from these two functions in order to reduce the chance to misuse the API. Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed May 21, 2018 at 16:54 UTC 342c513a4ae100354097a9ca99a080eeb7e70c0b

2 files changed +6 -4

argv-array.c

+4 -2

@@ -21,12 +21,13 @@ static void argv_array_push_nodup(struct argv_array *array, const char *value)

21 array->argv[array->argc] = NULL;

22 }

24 -void argv_array_push(struct argv_array *array, const char *value)

24 +const char *argv_array_push(struct argv_array *array, const char *value)

25 {

26 argv_array_push_nodup(array, xstrdup(value));

27 + return array->argv[array->argc - 1];

28 }

29 -void argv_array_pushf(struct argv_array *array, const char *fmt, ...)

30 +const char *argv_array_pushf(struct argv_array *array, const char *fmt, ...)

31 {

32 va_list ap;

33 struct strbuf v = STRBUF_INIT;

@@ -36,6 +37,7 @@ void argv_array_pushf(struct argv_array *array, const char *fmt, ...)

37 va_end(ap);

39 argv_array_push_nodup(array, strbuf_detach(&v, NULL));

40 + return array->argv[array->argc - 1];

41 }

43 void argv_array_pushl(struct argv_array *array, ...)

argv-array.h

+2 -2

@@ -12,9 +12,9 @@ struct argv_array {

12 #define ARGV_ARRAY_INIT { empty_argv, 0, 0 }

14 void argv_array_init(struct argv_array *);

15 -void argv_array_push(struct argv_array *, const char *);

15 +const char *argv_array_push(struct argv_array *, const char *);

16 __attribute__((format (printf,2,3)))

17 -void argv_array_pushf(struct argv_array *, const char *fmt, ...);

17 +const char *argv_array_pushf(struct argv_array *, const char *fmt, ...);

18 LAST_ARG_MUST_BE_NULL

19 void argv_array_pushl(struct argv_array *, ...);

20 void argv_array_pushv(struct argv_array *, const char **);