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>

diff --git a/argv-array.c b/argv-array.c
index 5d370fa3366163f8c0c81ca0b6b1a64a7030c696..449dfc105a2e6a803f329ff4cf2f3a5a86ba82d7 100644 (file)
--- 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;
 }
 
        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));
 {
        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;
 {
        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));
        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, ...)
 }
 
 void argv_array_pushl(struct argv_array *array, ...)

diff --git a/argv-array.h b/argv-array.h
index 29056e49a1208b5506d0809c7311e4112dc1f7f3..715c93b246c9878a42a45f94d4a1e4089676e899 100644 (file)
--- a/argv-array.h
+++ b/argv-array.h
@@ -12,9 +12,9 @@ struct argv_array {
 #define ARGV_ARRAY_INIT { empty_argv, 0, 0 }
 
 void argv_array_init(struct argv_array *);
 #define ARGV_ARRAY_INIT { empty_argv, 0, 0 }
 
 void argv_array_init(struct argv_array *);

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

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

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

 LAST_ARG_MUST_BE_NULL
 void argv_array_pushl(struct argv_array *, ...);
 void argv_array_pushv(struct argv_array *, const char **);
 LAST_ARG_MUST_BE_NULL
 void argv_array_pushl(struct argv_array *, ...);
 void argv_array_pushv(struct argv_array *, const char **);