git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use C99 initialisations for iterators
[exim.git]
/
src
/
src
/
lookups
/
redis.c
diff --git
a/src/src/lookups/redis.c
b/src/src/lookups/redis.c
index e9ddf884c55572de5aa4255fee55d9249f7c8619..e84f7667512cb32e69a1a75fbb430b5c46a27376 100644
(file)
--- a/
src/src/lookups/redis.c
+++ b/
src/src/lookups/redis.c
@@
-92,7
+92,7
@@
We can write to the string, since it is in a nextinlist temporary buffer.
This copy is also used for debugging output. */
memset(sdata, 0, sizeof(sdata)) /* Set all to NULL */;
This copy is also used for debugging output. */
memset(sdata, 0, sizeof(sdata)) /* Set all to NULL */;
-for (i = 2; i > 0; i--)
+for (i
nt i
= 2; i > 0; i--)
{
uschar *pp = Ustrrchr(server, '/');
{
uschar *pp = Ustrrchr(server, '/');
@@
-205,9
+205,8
@@
if(sdata[1])
/* split string on whitespace into argv */
{
uschar * argv[32];
/* split string on whitespace into argv */
{
uschar * argv[32];
- int i;
const uschar * s = command;
const uschar * s = command;
- int siz, ptr;
+ int siz, ptr
, i
;
uschar c;
while (isspace(*s)) s++;
uschar c;
while (isspace(*s)) s++;
@@
-281,7
+280,7
@@
switch (redis_reply->type)
/* NOTE: For now support 1 nested array result. If needed a limitless
result can be parsed */
/* 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 (i
nt i
= 0; i < redis_reply->elements; i++)
{
entry = redis_reply->element[i];
{
entry = redis_reply->element[i];
@@
-291,13
+290,13
@@
switch (redis_reply->type)
switch (entry->type)
{
case REDIS_REPLY_INTEGER:
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:
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];
{
tentry = entry->element[j];
@@
-307,7
+306,7
@@
switch (redis_reply->type)
switch (tentry->type)
{
case REDIS_REPLY_INTEGER:
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);
break;
case REDIS_REPLY_STRING:
result = string_catn(result, US tentry->str, tentry->len);