X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fstrv.c;h=066dd09276e7aa77672b9bb98a2491657bc4abc0;hb=c375a7f750d0ac3ab130b8d84ebbcbbf32b96c72;hp=71b77c9bbf97d857cce44ac0af1c350463d3ff50;hpb=7640a5de1b3ffe6547200ad204d14e4f067caf4f;p=elogind.git diff --git a/src/strv.c b/src/strv.c index 71b77c9bb..066dd0927 100644 --- a/src/strv.c +++ b/src/strv.c @@ -67,11 +67,11 @@ void strv_free(char **l) { char **strv_copy(char **l) { char **r, **k; - if (!(r = new(char*, strv_length(l)+1))) + if (!(k = r = new(char*, strv_length(l)+1))) return NULL; if (l) - for (k = r; *l; k++, l++) + for (; *l; k++, l++) if (!(*k = strdup(*l))) goto fail; @@ -105,7 +105,6 @@ char **strv_new_ap(const char *x, va_list ap) { unsigned n = 0, i = 0; va_list aq; - if (x) { n = 1;