argv-array: add a new "pushl" method

It can be convenient to push many strings in a single line
(e.g., if you are initializing an array with defaults). This
patch provides a convenience wrapper to allow this.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/technical/api-argv-array.txt b/Documentation/technical/api-argv-array.txt
index 49b3d529526ebc109b380c9cb203a38571c5b15c..1b7d8f140c27d76cfa460c0839c44c6742110df7 100644 (file)
--- a/Documentation/technical/api-argv-array.txt
+++ b/Documentation/technical/api-argv-array.txt
@@ -37,6 +37,11 @@ Functions
 `argv_array_push`::
        Push a copy of a string onto the end of the array.
 
 `argv_array_push`::
        Push a copy of a string onto the end of the array.
 

+`argv_array_pushl`::
+       Push a list of strings onto the end of the array. The arguments
+       should be a list of `const char *` strings, terminated by a NULL
+       argument.
+

 `argv_array_pushf`::
        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_pushf`::
        Format a string and push it onto the end of the array. This is a
        convenience wrapper combining `strbuf_addf` and `argv_array_push`.

diff --git a/argv-array.c b/argv-array.c
index 110a61b93a088535c602a3945da8a97733f96845..0b5f8898a10f16df8a6273f8960f05b670ba94bc 100644 (file)
--- a/argv-array.c
+++ b/argv-array.c
@@ -38,6 +38,17 @@ void argv_array_pushf(struct argv_array *array, const char *fmt, ...)
        argv_array_push_nodup(array, strbuf_detach(&v, NULL));
 }
 
        argv_array_push_nodup(array, strbuf_detach(&v, NULL));
 }
 

+void argv_array_pushl(struct argv_array *array, ...)
+{
+       va_list ap;
+       const char *arg;
+
+       va_start(ap, array);
+       while((arg = va_arg(ap, const char *)))
+               argv_array_push(array, arg);
+       va_end(ap);
+}
+

 void argv_array_clear(struct argv_array *array)
 {
        if (array->argv != empty_argv) {
 void argv_array_clear(struct argv_array *array)
 {
        if (array->argv != empty_argv) {

diff --git a/argv-array.h b/argv-array.h
index c45c698d53d6c8b59cac94b9f586c11863ceb372..b93a69c36cb8d391c1d7de93f75b3d54c00e60ca 100644 (file)
--- a/argv-array.h
+++ b/argv-array.h
@@ -15,6 +15,7 @@ void argv_array_init(struct argv_array *);
 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_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_clear(struct argv_array *);
 
 #endif /* ARGV_ARRAY_H */
 void argv_array_clear(struct argv_array *);
 
 #endif /* ARGV_ARRAY_H */