From 82dde599ed2b8aa4877900d84e7a2ddc31ef8da2 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 18 Jan 2013 00:47:19 +0100 Subject: strv: make strv_extend() smarter --- src/shared/strv.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'src/shared/strv.c') diff --git a/src/shared/strv.c b/src/shared/strv.c index aed45d2612..2d556f4a07 100644 --- a/src/shared/strv.c +++ b/src/shared/strv.c @@ -372,15 +372,26 @@ fail: int strv_extend(char ***l, const char *value) { char **c; + char *v; + unsigned n; if (!value) return 0; - c = strv_append(*l, value); - if (!c) + v = strdup(value); + if (!v) return -ENOMEM; - strv_free(*l); + n = strv_length(*l); + c = realloc(*l, sizeof(char*) * (n + 2)); + if (!c) { + free(v); + return -ENOMEM; + } + + c[n] = v; + c[n+1] = NULL; + *l = c; return 0; } -- cgit v1.2.3-54-g00ecf