ba4d1c7b16
Since the array struct stores a "const char **" argv member (for compatibility with most of our argv-taking functions), we have to cast away the const-ness when freeing its elements. However, we used the wrong type when doing so. It doesn't make a difference since free() take a void pointer anyway, but it can be slightly confusing to a reader. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
71 lines
1.4 KiB
C
71 lines
1.4 KiB
C
#include "cache.h"
|
|
#include "argv-array.h"
|
|
#include "strbuf.h"
|
|
|
|
const char *empty_argv[] = { NULL };
|
|
|
|
void argv_array_init(struct argv_array *array)
|
|
{
|
|
array->argv = empty_argv;
|
|
array->argc = 0;
|
|
array->alloc = 0;
|
|
}
|
|
|
|
static void argv_array_push_nodup(struct argv_array *array, const char *value)
|
|
{
|
|
if (array->argv == empty_argv)
|
|
array->argv = NULL;
|
|
|
|
ALLOC_GROW(array->argv, array->argc + 2, array->alloc);
|
|
array->argv[array->argc++] = value;
|
|
array->argv[array->argc] = NULL;
|
|
}
|
|
|
|
void argv_array_push(struct argv_array *array, const char *value)
|
|
{
|
|
argv_array_push_nodup(array, xstrdup(value));
|
|
}
|
|
|
|
void argv_array_pushf(struct argv_array *array, const char *fmt, ...)
|
|
{
|
|
va_list ap;
|
|
struct strbuf v = STRBUF_INIT;
|
|
|
|
va_start(ap, fmt);
|
|
strbuf_vaddf(&v, fmt, ap);
|
|
va_end(ap);
|
|
|
|
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_pop(struct argv_array *array)
|
|
{
|
|
if (!array->argc)
|
|
return;
|
|
free((char *)array->argv[array->argc - 1]);
|
|
array->argv[array->argc - 1] = NULL;
|
|
array->argc--;
|
|
}
|
|
|
|
void argv_array_clear(struct argv_array *array)
|
|
{
|
|
if (array->argv != empty_argv) {
|
|
int i;
|
|
for (i = 0; i < array->argc; i++)
|
|
free((char *)array->argv[i]);
|
|
free(array->argv);
|
|
}
|
|
argv_array_init(array);
|
|
}
|