constify

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

diff --git a/src/src/lookups/redis.c b/src/src/lookups/redis.c
index e84f7667512cb32e69a1a75fbb430b5c46a27376..b5c2eda235aaf52115e87e98a0936eb5e681b4ea 100644 (file)
--- a/src/src/lookups/redis.c
+++ b/src/src/lookups/redis.c
@@ -28,7 +28,7 @@ static redis_connection *redis_connections = NULL;
 
 
 static void *
 
 
 static void *

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

 {
 return (void *)(1);
 }
 {
 return (void *)(1);
 }


@@ -47,7 +47,7 @@ redis_connection *cn;
 while ((cn = redis_connections))
   {
   redis_connections = cn->next;
 while ((cn = redis_connections))
   {
   redis_connections = cn->next;

-  DEBUG(D_lookup) debug_printf("close REDIS connection: %s\n", cn->server);
+  DEBUG(D_lookup) debug_printf_indent("close REDIS connection: %s\n", cn->server);

   redisFree(cn->handle);
   }
 }
   redisFree(cn->handle);
   }
 }


@@ -154,7 +154,7 @@ if (!cn)
     }
 
   DEBUG(D_lookup)
     }
 
   DEBUG(D_lookup)

-    debug_printf("REDIS new connection: host=%s port=%d socket=%s database=%s\n",
+    debug_printf_indent("REDIS new connection: host=%s port=%d socket=%s database=%s\n",

       sdata[0], port, socket, sdata[1]);
 
   /* Get store for a new handle, initialize it, and connect to the server */
       sdata[0], port, socket, sdata[1]);
 
   /* Get store for a new handle, initialize it, and connect to the server */


@@ -163,13 +163,13 @@ if (!cn)
     socket ? redisConnectUnix(CCS socket) : redisConnect(CCS server, port);
   if (!redis_handle)
     {
     socket ? redisConnectUnix(CCS socket) : redisConnect(CCS server, port);
   if (!redis_handle)
     {

-    *errmsg = string_sprintf("REDIS connection failed");
+    *errmsg = US"REDIS connection failed";

     *defer_break = FALSE;
     goto REDIS_EXIT;
     }
 
   /* Add the connection to the cache */
     *defer_break = FALSE;
     goto REDIS_EXIT;
     }
 
   /* Add the connection to the cache */

-  cn = store_get(sizeof(redis_connection));
+  cn = store_get(sizeof(redis_connection), FALSE);

   cn->server = server_copy;
   cn->handle = redis_handle;
   cn->next = redis_connections;
   cn->server = server_copy;
   cn->handle = redis_handle;
   cn->next = redis_connections;


@@ -178,7 +178,7 @@ if (!cn)
 else
   {
   DEBUG(D_lookup)
 else
   {
   DEBUG(D_lookup)

-    debug_printf("REDIS using cached connection for %s\n", server_copy);
+    debug_printf_indent("REDIS using cached connection for %s\n", server_copy);

 }
 
 /* Authenticate if there is a password */
 }
 
 /* Authenticate if there is a password */


@@ -199,7 +199,7 @@ if(sdata[1])
     *defer_break = FALSE;
     goto REDIS_EXIT;
     }
     *defer_break = FALSE;
     goto REDIS_EXIT;
     }

-  DEBUG(D_lookup) debug_printf("REDIS: Selecting database=%s\n", sdata[1]);
+  DEBUG(D_lookup) debug_printf_indent("REDIS: Selecting database=%s\n", sdata[1]);

   }
 
 /* split string on whitespace into argv */
   }
 
 /* split string on whitespace into argv */


@@ -220,15 +220,14 @@ if(sdata[1])
        g = string_catn(g, s, 1);
     argv[i] = string_from_gstring(g);
 
        g = string_catn(g, s, 1);
     argv[i] = string_from_gstring(g);
 

-    DEBUG(D_lookup) debug_printf("REDIS: argv[%d] '%s'\n", i, argv[i]);
+    DEBUG(D_lookup) debug_printf_indent("REDIS: argv[%d] '%s'\n", i, argv[i]);

     while (isspace(*s)) s++;
     }
 
   /* Run the command. We use the argv form rather than plain as that parses
   into args by whitespace yet has no escaping mechanism. */
 
     while (isspace(*s)) s++;
     }
 
   /* Run the command. We use the argv form rather than plain as that parses
   into args by whitespace yet has no escaping mechanism. */
 

-  redis_reply = redisCommandArgv(redis_handle, i, (const char **) argv, NULL);
-  if (!redis_reply)
+  if (!(redis_reply = redisCommandArgv(redis_handle, i, CCSS argv, NULL)))

     {
     *errmsg = string_sprintf("REDIS: query failed: %s\n", redis_handle->errstr);
     *defer_break = FALSE;
     {
     *errmsg = string_sprintf("REDIS: query failed: %s\n", redis_handle->errstr);
     *defer_break = FALSE;


@@ -245,7 +244,7 @@ switch (redis_reply->type)
     if (Ustrncmp(redis_reply->str, "MOVED", 5) == 0)
       {
       DEBUG(D_lookup)
     if (Ustrncmp(redis_reply->str, "MOVED", 5) == 0)
       {
       DEBUG(D_lookup)

-        debug_printf("REDIS: cluster redirect %s\n", redis_reply->str);
+        debug_printf_indent("REDIS: cluster redirect %s\n", redis_reply->str);

       /* follow redirect
       This is cheating, we simply set defer_break = FALSE to move on to
       the next server in the redis_servers list */
       /* follow redirect
       This is cheating, we simply set defer_break = FALSE to move on to
       the next server in the redis_servers list */


@@ -260,7 +259,7 @@ switch (redis_reply->type)
 
   case REDIS_REPLY_NIL:
     DEBUG(D_lookup)
 
   case REDIS_REPLY_NIL:
     DEBUG(D_lookup)

-      debug_printf("REDIS: query was not one that returned any data\n");
+      debug_printf_indent("REDIS: query was not one that returned any data\n");

     result = string_catn(result, US"", 1);
     *do_cache = 0;
     goto REDIS_EXIT;
     result = string_catn(result, US"", 1);
     *do_cache = 0;
     goto REDIS_EXIT;


@@ -313,18 +312,18 @@ switch (redis_reply->type)
                break;
              case REDIS_REPLY_ARRAY:
                DEBUG(D_lookup)
                break;
              case REDIS_REPLY_ARRAY:
                DEBUG(D_lookup)

-                 debug_printf("REDIS: result has nesting of arrays which"
+                 debug_printf_indent("REDIS: result has nesting of arrays which"

                    " is not supported. Ignoring!\n");
                break;
              default:
                    " is not supported. Ignoring!\n");
                break;
              default:

-               DEBUG(D_lookup) debug_printf(
+               DEBUG(D_lookup) debug_printf_indent(

                          "REDIS: result has unsupported type. Ignoring!\n");
                break;
              }
            }
            break;
          default:
                          "REDIS: result has unsupported type. Ignoring!\n");
                break;
              }
            }
            break;
          default:

-           DEBUG(D_lookup) debug_printf("REDIS: query returned unsupported type\n");
+           DEBUG(D_lookup) debug_printf_indent("REDIS: query returned unsupported type\n");

            break;
          }
        }
            break;
          }
        }


@@ -333,7 +332,7 @@ switch (redis_reply->type)
 
 
 if (result)
 
 
 if (result)

-  store_reset(result->s + result->ptr + 1);
+  gstring_release_unused(result);

 else
   {
   yield = FAIL;
 else
   {
   yield = FAIL;


@@ -356,7 +355,7 @@ if (result)
   }
 else
   {
   }
 else
   {

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

   /* NOTE: Required to close connection since it needs to be reopened */
   return yield;      /* FAIL or DEFER */
   }
   /* NOTE: Required to close connection since it needs to be reopened */
   return yield;      /* FAIL or DEFER */
   }


@@ -375,10 +374,10 @@ else
  */
 
 static int
  */
 
 static int

-redis_find(void *handle __attribute__((unused)),
-  uschar *filename __attribute__((unused)),
-  const uschar *command, int length, uschar **result, uschar **errmsg,
-  uint *do_cache)
+redis_find(void * handle __attribute__((unused)),
+  const uschar * filename __attribute__((unused)),
+  const uschar * command, int length, uschar ** result, uschar ** errmsg,
+  uint * do_cache)

 {
 return lf_sqlperform(US"Redis", US"redis_servers", redis_servers, command,
   result, errmsg, do_cache, perform_redis_search);
 {
 return lf_sqlperform(US"Redis", US"redis_servers", redis_servers, command,
   result, errmsg, do_cache, perform_redis_search);


@@ -416,7 +415,7 @@ while ((c = *t++) != 0)
   if (isspace(c) || c == '\\') count++;
 
 if (count == 0) return s;
   if (isspace(c) || c == '\\') count++;
 
 if (count == 0) return s;

-t = quoted = store_get(Ustrlen(s) + count + 1);
+t = quoted = store_get(Ustrlen(s) + count + 1, is_tainted(s));

 
 while ((c = *s++) != 0)
   {
 
 while ((c = *s++) != 0)
   {