constify

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

diff --git a/src/src/lookups/lmdb.c b/src/src/lookups/lmdb.c
index 48ad489f92276a6bd5ec3680338af4dfe7652ea4..712261a413a50bde976ccad165885e73ebf71cf8 100644 (file)
--- a/src/src/lookups/lmdb.c
+++ b/src/src/lookups/lmdb.c
@@ -2,7 +2,7 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 

-/* Copyright (c) University of Cambridge 2016 - 2017*/
+/* Copyright (c) University of Cambridge 2016 - 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"


@@ -23,14 +23,14 @@ MDB_dbi db_dbi;
 *************************************************/
 
 static void *
 *************************************************/
 
 static void *

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

 {
 MDB_env * db_env = NULL;
 Lmdbstrct * lmdb_p;
 int ret, save_errno;
 const uschar * errstr;
 
 {
 MDB_env * db_env = NULL;
 Lmdbstrct * lmdb_p;
 int ret, save_errno;
 const uschar * errstr;
 

-lmdb_p = store_get(sizeof(Lmdbstrct));
+lmdb_p = store_get(sizeof(Lmdbstrct), FALSE);

 lmdb_p->txn = NULL;
 
 if ((ret = mdb_env_create(&db_env)))
 lmdb_p->txn = NULL;
 
 if ((ret = mdb_env_create(&db_env)))


@@ -74,7 +74,7 @@ bad:
 *************************************************/
 
 static int
 *************************************************/
 
 static int

-lmdb_find(void * handle, uschar * filename,
+lmdb_find(void * handle, const uschar * filename,

     const uschar * keystring, int length, uschar ** result, uschar ** errmsg,
     uint * do_cache)
 {
     const uschar * keystring, int length, uschar ** result, uschar ** errmsg,
     uint * do_cache)
 {


@@ -85,24 +85,24 @@ Lmdbstrct * lmdb_p = handle;
 dbkey.mv_data = CS keystring;
 dbkey.mv_size = length;
 
 dbkey.mv_data = CS keystring;
 dbkey.mv_size = length;
 

-DEBUG(D_lookup) debug_printf("LMDB: lookup key: %s\n", CS keystring);
+DEBUG(D_lookup) debug_printf_indent("LMDB: lookup key: %s\n", CS keystring);

 
 if ((ret = mdb_get(lmdb_p->txn, lmdb_p->db_dbi, &dbkey, &data)) == 0)
   {
   *result = string_copyn(US data.mv_data, data.mv_size);
 
 if ((ret = mdb_get(lmdb_p->txn, lmdb_p->db_dbi, &dbkey, &data)) == 0)
   {
   *result = string_copyn(US data.mv_data, data.mv_size);

-  DEBUG(D_lookup) debug_printf("LMDB: lookup result: %s\n", *result);
+  DEBUG(D_lookup) debug_printf_indent("LMDB: lookup result: %s\n", *result);

   return OK;
   }
 else if (ret == MDB_NOTFOUND)
   {
   *errmsg = US"LMDB: lookup, no data found";
   return OK;
   }
 else if (ret == MDB_NOTFOUND)
   {
   *errmsg = US"LMDB: lookup, no data found";

-  DEBUG(D_lookup) debug_printf("%s\n", *errmsg);
+  DEBUG(D_lookup) debug_printf_indent("%s\n", *errmsg);

   return FAIL;
   }
 else
   {
   *errmsg = string_sprintf("LMDB: lookup error: %s", mdb_strerror(ret));
   return FAIL;
   }
 else
   {
   *errmsg = string_sprintf("LMDB: lookup error: %s", mdb_strerror(ret));

-  DEBUG(D_lookup) debug_printf("%s\n", *errmsg);
+  DEBUG(D_lookup) debug_printf_indent("%s\n", *errmsg);

   return DEFER;
   }
 }
   return DEFER;
   }
 }