Mem-management: use proper define for constant

diff --git a/src/src/drtables.c b/src/src/drtables.c
index fff3af82f324f5831ada9c3b839497f121ccb887..424c6197c3f2dacdc02add170ea0714209d41a0f 100644 (file)
--- a/src/src/drtables.c
+++ b/src/src/drtables.c
@@ -563,7 +563,8 @@ static struct lookupmodulestr *lookupmodules = NULL;
 static void
 addlookupmodule(void *dl, struct lookup_module_info *info)
 {
-struct lookupmodulestr *p = store_get(sizeof(struct lookupmodulestr), GET_UNTAINTED);
+struct lookupmodulestr * p =
+  store_get(sizeof(struct lookupmodulestr), GET_UNTAINTED);
 
 p->dl = dl;
 p->info = info;

diff --git a/src/src/host.c b/src/src/host.c
index 182e5068b849a63c2bb29c0599d372d6889cbda3..742cfec4803ca26d17d7866c60fb3806b25a78e1 100644 (file)
--- a/src/src/host.c
+++ b/src/src/host.c
@@ -737,7 +737,7 @@ add_unique_interface(ip_address_item *list, ip_address_item *ipa)
 ip_address_item *ipa2;
 for (ipa2 = list; ipa2; ipa2 = ipa2->next)
   if (Ustrcmp(ipa2->address, ipa->address) == 0) return list;
-ipa2 = store_get_perm(sizeof(ip_address_item), FALSE);
+ipa2 = store_get_perm(sizeof(ip_address_item), GET_UNTAINTED);
 *ipa2 = *ipa;
 ipa2->next = list;
 return ipa2;

diff --git a/src/src/readconf.c b/src/src/readconf.c
index b7df7be25931c9b81da77643ee413c70bb8a464e..231d3feb64f376da55cc9b63453a6f15f264b3af 100644 (file)
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -3078,7 +3078,7 @@ read_named_list(tree_node **anchorp, int *numberp, int max, uschar *s,
 BOOL forcecache = FALSE;
 uschar *ss;
 tree_node *t;
-namedlist_block * nb = store_get_perm(sizeof(namedlist_block), FALSE);
+namedlist_block * nb = store_get_perm(sizeof(namedlist_block), GET_UNTAINTED);
 
 if (Ustrncmp(s, "_cache", 6) == 0)
   {
@@ -3724,7 +3724,7 @@ for (driver_info * dd = drivers_available; dd->driver_name[0] != 0;
     {
     int len = dd->options_len;
     d->info = dd;
-    d->options_block = store_get_perm(len, FALSE);
+    d->options_block = store_get_perm(len, GET_UNTAINTED);
     memcpy(d->options_block, dd->options_block, len);
     for (int i = 0; i < *(dd->options_count); i++)
       dd->options[i].type &= ~opt_set;
@@ -3841,7 +3841,7 @@ while ((buffer = get_config_line()))
     /* Set up a new driver instance data block on the chain, with
     its default values installed. */
 
-    d = store_get_perm(instance_size, FALSE);
+    d = store_get_perm(instance_size, GET_UNTAINTED);
     memcpy(d, instance_default, instance_size);
     *p = d;
     p = (driver_instance **)&d->next;

diff --git a/src/src/spool_in.c b/src/src/spool_in.c
index c788fd8f810bb3bf03fbe977d46eac0f686931f0..4ee1455d06e614f1e5e35bba0102f296725abb6f 100644 (file)
--- a/src/src/spool_in.c
+++ b/src/src/spool_in.c
@@ -323,7 +323,7 @@ while ((len = Ustrlen(big_buffer)) == big_buffer_size-1
 
   if (big_buffer_size >= BIG_BUFFER_SIZE * 4) return NULL;
   newsize = big_buffer_size * 2;
-  newbuffer = store_get_perm(newsize, FALSE);
+  newbuffer = store_get_perm(newsize, GET_UNTAINTED);
   memcpy(newbuffer, big_buffer, len);
 
   big_buffer = newbuffer;