summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2017-06-22 11:00:21 +0200
committerantirez <antirez@gmail.com>2017-06-22 11:01:51 +0200
commitd067e3342fefe0be14ce5294a53ea2c76a2a0d04 (patch)
treeece4eef71bf8108e22c92576765de6cde8d722d8
parent2b0f03e4f219a25b06c006e3ee3a4c8da0045d19 (diff)
downloadredis-d067e3342fefe0be14ce5294a53ea2c76a2a0d04.tar.gz
Aesthetic changes to #4068 PR to conform to Redis coding standard.
1. Inline if ... statement if short. 2. No lines over 80 columns.
-rw-r--r--src/aof.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/aof.c b/src/aof.c
index ea9ac47ab..3b80ca1d4 100644
--- a/src/aof.c
+++ b/src/aof.c
@@ -542,17 +542,16 @@ void feedAppendOnlyFile(struct redisCommand *cmd, int dictid, robj **argv, int a
/* Translate SET [EX seconds][PX milliseconds] to SET and PEXPIREAT */
buf = catAppendOnlyGenericCommand(buf,3,argv);
for (i = 3; i < argc; i ++) {
- if (!strcasecmp(argv[i]->ptr, "ex"))
- exarg = argv[i+1];
-
- if (!strcasecmp(argv[i]->ptr, "px"))
- pxarg = argv[i+1];
+ if (!strcasecmp(argv[i]->ptr, "ex")) exarg = argv[i+1];
+ if (!strcasecmp(argv[i]->ptr, "px")) pxarg = argv[i+1];
}
serverAssert(!(exarg && pxarg));
if (exarg)
- buf = catAppendOnlyExpireAtCommand(buf,server.expireCommand,argv[1],exarg);
+ buf = catAppendOnlyExpireAtCommand(buf,server.expireCommand,argv[1],
+ exarg);
if (pxarg)
- buf = catAppendOnlyExpireAtCommand(buf,server.pexpireCommand,argv[1],pxarg);
+ buf = catAppendOnlyExpireAtCommand(buf,server.pexpireCommand,argv[1],
+ pxarg);
} else {
/* All the other commands don't need translation or need the
* same translation already operated in the command vector