src/query.c: New function `adns__free_interim' for releasing memory.

Useful, for example, if you're growing a dynamically allocated array.

Signed-off-by: Mark Wooding <mdw@distorted.org.uk>

diff --git a/src/internal.h b/src/internal.h
index 7faa2123c4abe4bffec95183ed607c0ed1551536..a53711535246c13678872b0799a6d254ffb27bc0 100644 (file)
--- a/src/internal.h
+++ b/src/internal.h
@@ -672,6 +672,10 @@ void adns__transfer_interim(adns_query from, adns_query to, void *block);
  * TTLs get inherited by their parents.
  */
 
  * TTLs get inherited by their parents.
  */
 

+void adns__free_interim(adns_query qu, void *p);
+/* Forget about a block allocated by adns__alloc_interim.
+ */
+

 void *adns__alloc_mine(adns_query qu, size_t sz);
 /* Like _interim, but does not record the length for later
  * copying into the answer.  This just ensures that the memory
 void *adns__alloc_mine(adns_query qu, size_t sz);
 /* Like _interim, but does not record the length for later
  * copying into the answer.  This just ensures that the memory

diff --git a/src/query.c b/src/query.c
index c18ba8e991c3481f33057bf44145a6025a2d3605..ebbfd53a135416ea7b6575121b846a67d8c8f6ab 100644 (file)
--- a/src/query.c
+++ b/src/query.c
@@ -415,6 +415,17 @@ static allocnode *alloc_info(adns_query qu, void *p, size_t *sz_r) {
   return an;
 }
 
   return an;
 }
 

+void adns__free_interim(adns_query qu, void *p) {
+  size_t sz;
+  allocnode *an= alloc_info(qu, p, &sz);
+
+  if (!an) return;
+  assert(!qu->final_allocspace);
+  LIST_UNLINK(qu->allocations, an);
+  free(an);
+  qu->interim_allocd -= sz;
+}
+

 void *adns__alloc_mine(adns_query qu, size_t sz) {
   return alloc_common(qu,MEM_ROUND(sz));
 }
 void *adns__alloc_mine(adns_query qu, size_t sz) {
   return alloc_common(qu,MEM_ROUND(sz));
 }