X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=src%2Fquery.c;h=1d4dc5fd94df3753d7e9107a5630763482e6bf44;hp=7c977bb5a09c071335233ef5088f82b6932074c5;hb=f759e52e11ee649677ee1fdf74e9e6a8557289e4;hpb=a49a6d7b1f7da9722082778d6694ccbc077d262a diff --git a/src/query.c b/src/query.c index 7c977bb..1d4dc5f 100644 --- a/src/query.c +++ b/src/query.c @@ -158,23 +158,31 @@ void adns_cancel(adns_query query) { abort(); /* fixme */ } -void *adns__alloc_interim(adns_query qu, size_t sz) { +static void *alloc_common(adns_query qu, size_t sz) { allocnode *an; if (!sz) return qu; /* Any old pointer will do */ assert(!qu->final_allocspace); - sz= MEM_ROUND(sz); an= malloc(MEM_ROUND(MEM_ROUND(sizeof(*an)) + sz)); if (!an) { adns__query_fail(qu,adns_s_nolocalmem); return 0; } - qu->interim_allocd += sz; an->next= qu->allocations; qu->allocations= an; return (byte*)an + MEM_ROUND(sizeof(*an)); } +void *adns__alloc_interim(adns_query qu, size_t sz) { + sz= MEM_ROUND(sz); + qu->interim_allocd += sz; + return alloc_common(qu,sz); +} + +void *adns__alloc_mine(adns_query qu, size_t sz) { + return alloc_common(qu,MEM_ROUND(sz)); +} + void *adns__alloc_final(adns_query qu, size_t sz) { /* When we're in the _final stage, we _subtract_ from interim_alloc'd * each allocation, and use final_allocspace to point to the next free