constify

[exim.git] / src / src / lookups / lsearch.c

diff --git a/src/src/lookups/lsearch.c b/src/src/lookups/lsearch.c
index eb70a45fab4691bb1fd2bff74a054f61377adfca..92a76e7c390b16e5efcd1ba1ad00a67cff0f0b0e 100644 (file)
--- a/src/src/lookups/lsearch.c
+++ b/src/src/lookups/lsearch.c
@@ -2,7 +2,7 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 

-/* Copyright (c) University of Cambridge 1995 - 2015 */
+/* Copyright (c) University of Cambridge 1995 - 2018 */

 /* See the file NOTICE for conditions of use and distribution. */
 
 #include "../exim.h"
 /* See the file NOTICE for conditions of use and distribution. */
 
 #include "../exim.h"


@@ -26,7 +26,7 @@ enum {
 /* See local README for interface description */
 
 static void *
 /* See local README for interface description */
 
 static void *

-lsearch_open(uschar *filename, uschar **errmsg)
+lsearch_open(const uschar * filename, uschar ** errmsg)

 {
 FILE *f = Ufopen(filename, "rb");
 if (f == NULL)
 {
 FILE *f = Ufopen(filename, "rb");
 if (f == NULL)


@@ -46,7 +46,7 @@ return f;
 *************************************************/
 
 static BOOL
 *************************************************/
 
 static BOOL

-lsearch_check(void *handle, uschar *filename, int modemask, uid_t *owners,
+lsearch_check(void *handle, const uschar *filename, int modemask, uid_t *owners,

   gid_t *owngroups, uschar **errmsg)
 {
 return lf_check_file(fileno((FILE *)handle), filename, S_IFREG, modemask,
   gid_t *owngroups, uschar **errmsg)
 {
 return lf_check_file(fileno((FILE *)handle), filename, S_IFREG, modemask,


@@ -71,14 +71,15 @@ fit into the fixed sized buffer. Most of the time this will never be exercised,
 but people do occasionally do weird things. */
 
 static int
 but people do occasionally do weird things. */
 
 static int

-internal_lsearch_find(void *handle, uschar *filename, const uschar *keystring,
-  int length, uschar **result, uschar **errmsg, int type)
+internal_lsearch_find(void * handle, const uschar * filename,
+  const uschar * keystring, int length, uschar ** result, uschar ** errmsg,
+ int type)

 {
 FILE *f = (FILE *)handle;
 BOOL last_was_eol = TRUE;
 BOOL this_is_eol = TRUE;
 int old_pool = store_pool;
 {
 FILE *f = (FILE *)handle;
 BOOL last_was_eol = TRUE;
 BOOL this_is_eol = TRUE;
 int old_pool = store_pool;

-void *reset_point = NULL;
+rmark reset_point = NULL;

 uschar buffer[4096];
 
 /* Wildcard searches may use up some store, because of expansions. We don't
 uschar buffer[4096];
 
 /* Wildcard searches may use up some store, because of expansions. We don't


@@ -90,7 +91,7 @@ safely stored in the search pool again. */
 if(type == LSEARCH_WILD || type == LSEARCH_NWILD)
   {
   store_pool = POOL_MAIN;
 if(type == LSEARCH_WILD || type == LSEARCH_NWILD)
   {
   store_pool = POOL_MAIN;

-  reset_point = store_get(0);
+  reset_point = store_mark();

   }
 
 filename = filename;  /* Keep picky compilers happy */
   }
 
 filename = filename;  /* Keep picky compilers happy */


@@ -101,11 +102,10 @@ for (last_was_eol = TRUE;
      Ufgets(buffer, sizeof(buffer), f) != NULL;
      last_was_eol = this_is_eol)
   {
      Ufgets(buffer, sizeof(buffer), f) != NULL;
      last_was_eol = this_is_eol)
   {

-  int ptr, size;

   int p = Ustrlen(buffer);
   int linekeylength;
   BOOL this_is_comment;
   int p = Ustrlen(buffer);
   int linekeylength;
   BOOL this_is_comment;

-  uschar *yield;
+  gstring * yield;

   uschar *s = buffer;
 
   /* Check whether this the final segment of a line. If it follows an
   uschar *s = buffer;
 
   /* Check whether this the final segment of a line. If it follows an


@@ -240,9 +240,9 @@ for (last_was_eol = TRUE;
 
   /* Reset dynamic store, if we need to, and revert to the search pool */
 
 
   /* Reset dynamic store, if we need to, and revert to the search pool */
 

-  if (reset_point != NULL)
+  if (reset_point)

     {
     {

-    store_reset(reset_point);
+    reset_point = store_reset(reset_point);

     store_pool = old_pool;
     }
 
     store_pool = old_pool;
     }
 


@@ -254,11 +254,9 @@ for (last_was_eol = TRUE;
   Initialize, and copy the first segment of data. */
 
   this_is_comment = FALSE;
   Initialize, and copy the first segment of data. */
 
   this_is_comment = FALSE;

-  size = 100;
-  ptr = 0;
-  yield = store_get(size);
+  yield = string_get(100);

   if (*s != 0)
   if (*s != 0)

-    yield = string_cat(yield, &size, &ptr, s, Ustrlen(s));
+    yield = string_cat(yield, s);

 
   /* Now handle continuations */
 
 
   /* Now handle continuations */
 


@@ -294,18 +292,17 @@ for (last_was_eol = TRUE;
 
     /* Join a physical or logical line continuation onto the result string. */
 
 
     /* Join a physical or logical line continuation onto the result string. */
 

-    yield = string_cat(yield, &size, &ptr, s, Ustrlen(s));
+    yield = string_cat(yield, s);

     }
 
     }
 

-  yield[ptr] = 0;
-  store_reset(yield + ptr + 1);
-  *result = yield;
+  gstring_release_unused(yield);
+  *result = string_from_gstring(yield);

   return OK;
   }
 
 /* Reset dynamic store, if we need to */
 
   return OK;
   }
 
 /* Reset dynamic store, if we need to */
 

-if (reset_point != NULL)
+if (reset_point)

   {
   store_reset(reset_point);
   store_pool = old_pool;
   {
   store_reset(reset_point);
   store_pool = old_pool;


@@ -322,8 +319,8 @@ return FAIL;
 /* See local README for interface description */
 
 static int
 /* See local README for interface description */
 
 static int

-lsearch_find(void *handle, uschar *filename, const uschar *keystring, int length,
-  uschar **result, uschar **errmsg, uint *do_cache)
+lsearch_find(void * handle, const uschar * filename, const uschar * keystring,
+  int length, uschar ** result, uschar ** errmsg, uint * do_cache)

 {
 do_cache = do_cache;  /* Keep picky compilers happy */
 return internal_lsearch_find(handle, filename, keystring, length, result,
 {
 do_cache = do_cache;  /* Keep picky compilers happy */
 return internal_lsearch_find(handle, filename, keystring, length, result,


@@ -339,8 +336,8 @@ return internal_lsearch_find(handle, filename, keystring, length, result,
 /* See local README for interface description */
 
 static int
 /* See local README for interface description */
 
 static int

-wildlsearch_find(void *handle, uschar *filename, const uschar *keystring, int length,
-  uschar **result, uschar **errmsg, uint *do_cache)
+wildlsearch_find(void * handle, const uschar * filename, const uschar * keystring,
+  int length, uschar ** result, uschar ** errmsg, uint * do_cache)

 {
 do_cache = do_cache;  /* Keep picky compilers happy */
 return internal_lsearch_find(handle, filename, keystring, length, result,
 {
 do_cache = do_cache;  /* Keep picky compilers happy */
 return internal_lsearch_find(handle, filename, keystring, length, result,


@@ -356,8 +353,8 @@ return internal_lsearch_find(handle, filename, keystring, length, result,
 /* See local README for interface description */
 
 static int
 /* See local README for interface description */
 
 static int

-nwildlsearch_find(void *handle, uschar *filename, const uschar *keystring, int length,
-  uschar **result, uschar **errmsg, uint *do_cache)
+nwildlsearch_find(void * handle, const uschar * filename, const uschar * keystring,
+  int length, uschar ** result, uschar ** errmsg, uint * do_cache)

 {
 do_cache = do_cache;  /* Keep picky compilers happy */
 return internal_lsearch_find(handle, filename, keystring, length, result,
 {
 do_cache = do_cache;  /* Keep picky compilers happy */
 return internal_lsearch_find(handle, filename, keystring, length, result,


@@ -374,23 +371,20 @@ return internal_lsearch_find(handle, filename, keystring, length, result,
 /* See local README for interface description */
 
 static int
 /* See local README for interface description */
 
 static int

-iplsearch_find(void *handle, uschar *filename, const uschar *keystring, int length,
-  uschar **result, uschar **errmsg, uint *do_cache)
+iplsearch_find(void * handle, uschar const * filename, const uschar * keystring,
+  int length, uschar ** result, uschar ** errmsg, uint * do_cache)

 {
 do_cache = do_cache;  /* Keep picky compilers happy */
 {
 do_cache = do_cache;  /* Keep picky compilers happy */

+

 if ((length == 1 && keystring[0] == '*') ||
     string_is_ip_address(keystring, NULL) != 0)
 if ((length == 1 && keystring[0] == '*') ||
     string_is_ip_address(keystring, NULL) != 0)

-  {

   return internal_lsearch_find(handle, filename, keystring, length, result,
     errmsg, LSEARCH_IP);
   return internal_lsearch_find(handle, filename, keystring, length, result,
     errmsg, LSEARCH_IP);

-  }
-else
-  {
-  *errmsg = string_sprintf("\"%s\" is not a valid iplsearch key (an IP "
-    "address, with optional CIDR mask, is wanted): "
-    "in a host list, use net-iplsearch as the search type", keystring);
-  return DEFER;
-  }
+
+*errmsg = string_sprintf("\"%s\" is not a valid iplsearch key (an IP "
+"address, with optional CIDR mask, is wanted): "
+"in a host list, use net-iplsearch as the search type", keystring);
+return DEFER;

 }
 
 
 }