This copy is also used for debugging output. */
memset(sdata, 0, sizeof(sdata)) /* Set all to NULL */;
-for (i = 2; i > 0; i--)
+for (int i = 2; i > 0; i--)
{
uschar *pp = Ustrrchr(server, '/');
/* split string on whitespace into argv */
{
uschar * argv[32];
- int i;
const uschar * s = command;
- int siz, ptr;
+ int siz, ptr, i;
uschar c;
while (isspace(*s)) s++;
*errmsg = string_sprintf("REDIS: lookup result failed: %s\n", redis_reply->str);
/* trap MOVED cluster responses and follow them */
- if (Ustrncmp(redis_reply->str, "MOVED", 5))
+ if (Ustrncmp(redis_reply->str, "MOVED", 5) == 0)
{
DEBUG(D_lookup)
debug_printf("REDIS: cluster redirect %s\n", redis_reply->str);
/* follow redirect
- This is cheating, we simply set defer_break = TRUE to move on to
+ This is cheating, we simply set defer_break = FALSE to move on to
the next server in the redis_servers list */
- *defer_break = TRUE;
+ *defer_break = FALSE;
return DEFER;
} else {
- *defer_break = FALSE;
+ *defer_break = TRUE;
}
*do_cache = 0;
goto REDIS_EXIT;
/* NOTE: For now support 1 nested array result. If needed a limitless
result can be parsed */
- for (i = 0; i < redis_reply->elements; i++)
+ for (int i = 0; i < redis_reply->elements; i++)
{
entry = redis_reply->element[i];
switch (entry->type)
{
case REDIS_REPLY_INTEGER:
- result = string_cat(result, string_sprintf("%d", entry->integer));
+ result = string_fmt_append(result, "%d", entry->integer);
break;
case REDIS_REPLY_STRING:
result = string_catn(result, US entry->str, entry->len);
break;
case REDIS_REPLY_ARRAY:
- for (j = 0; j < entry->elements; j++)
+ for (int j = 0; j < entry->elements; j++)
{
tentry = entry->element[j];
switch (tentry->type)
{
case REDIS_REPLY_INTEGER:
- result = string_cat(result, string_sprintf("%d", tentry->integer));
+ result = string_fmt_append(result, "%d", tentry->integer);
break;
case REDIS_REPLY_STRING:
result = string_catn(result, US tentry->str, tentry->len);