Imported Upstream version 2.14.3

[platform/upstream/git.git] / argv-array.h

diff --git a/argv-array.h b/argv-array.h
index 40248d4..29056e4 100644 (file)
--- a/argv-array.h
+++ b/argv-array.h
@@ -15,10 +15,11 @@ 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, ...);
+LAST_ARG_MUST_BE_NULL
 void argv_array_pushl(struct argv_array *, ...);
+void argv_array_pushv(struct argv_array *, const char **);
 void argv_array_pop(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);
+const char **argv_array_detach(struct argv_array *);
 
 #endif /* ARGV_ARRAY_H */