X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fhashmap.c;fp=src%2Fhashmap.c;h=ca83e9338552626db3f7d7770a10110cbaacc510;hp=53502576ad8b9773d08a528853ce7c27948c865c;hb=729e3769c32242bbba26ea96900be005d52ce438;hpb=4b7a6af440ee1a957fd8fe1c6ca3b7f310fdf77c diff --git a/src/hashmap.c b/src/hashmap.c index 53502576a..ca83e9338 100644 --- a/src/hashmap.c +++ b/src/hashmap.c @@ -596,16 +596,16 @@ Hashmap *hashmap_copy(Hashmap *h) { char **hashmap_get_strv(Hashmap *h) { char **sv; Iterator it; - char *path; + char *item; int n; - sv = malloc((h->n_entries+1) * sizeof(char *)); - if (sv == NULL) + sv = new(char*, h->n_entries+1); + if (!sv) return NULL; n = 0; - HASHMAP_FOREACH(path, h, it) - sv[n++] = path; + HASHMAP_FOREACH(item, h, it) + sv[n++] = item; sv[n] = NULL; return sv;