X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd%2Fsd-resolve.c;h=7cc8dc4f0ac82aedc12724f97d1daa67cd3bcef8;hb=885d1c80d991b7f9f8074c8d06f64dab1e53b7ad;hp=a368c1b13c4c99f629ecca3a19530b6b06fe73bc;hpb=5599e86621d85cc0ac1b5a368a951da23cfe1863;p=elogind.git diff --git a/src/libsystemd/sd-resolve.c b/src/libsystemd/sd-resolve.c index a368c1b13..7cc8dc4f0 100644 --- a/src/libsystemd/sd-resolve.c +++ b/src/libsystemd/sd-resolve.c @@ -423,7 +423,7 @@ sd_resolve* sd_resolve_new(unsigned n_proc) { if (n_proc > MAX_WORKERS) n_proc = MAX_WORKERS; - resolve = malloc(sizeof(sd_resolve)); + resolve = new(sd_resolve, 1); if (!resolve) { errno = ENOMEM; goto fail; @@ -562,7 +562,7 @@ static const void *unserialize_addrinfo(const void *p, struct addrinfo **ret_ai, if (*length < l) return NULL; - ai = malloc(sizeof(struct addrinfo)); + ai = new(struct addrinfo, 1); if (!ai) goto fail; @@ -765,7 +765,7 @@ static sd_resolve_query *alloc_query(sd_resolve *resolve) { resolve->current_index -= MAX_QUERIES; } - q = resolve->queries[resolve->current_index] = malloc(sizeof(sd_resolve_query)); + q = resolve->queries[resolve->current_index] = new(sd_resolve_query, 1); if (!q) { errno = ENOMEM; return NULL; @@ -1105,17 +1105,6 @@ void sd_resolve_freeaddrinfo(struct addrinfo *ai) { errno = saved_errno; } -void sd_resolve_freeanswer(unsigned char *answer) { - int saved_errno = errno; - - if (!answer) - return; - - free(answer); - - errno = saved_errno; -} - int sd_resolve_isdone(sd_resolve *resolve, sd_resolve_query*q) { assert(resolve); assert(q);