From 1c2352f0dd02753a3476871cec0dbb6a4b032064 Mon Sep 17 00:00:00 2001 From: antirez Date: Wed, 25 Jul 2018 16:32:52 +0200 Subject: [PATCH] Make emptyDb() change introduced in #4852 simpler to read. --- src/db.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/db.c b/src/db.c index 39686f1b..a2890639 100644 --- a/src/db.c +++ b/src/db.c @@ -337,10 +337,15 @@ long long emptyDb(int dbnum, int flags, void(callback)(void*)) { return -1; } - int j = dbnum == -1 ? 0 : dbnum; - int dbmax = dbnum == -1 ? server.dbnum : dbnum+1; + int startdb, enddb; + if (dbnum == -1) { + startdb = 0; + enddb = server.dbnum-1; + } else { + startdb = enddb = dbnum; + } - for (; j < dbmax; j++) { + for (int j = startdb; j <= enddb; j++) { if (dbnum != -1 && dbnum != j) continue; removed += dictSize(server.db[j].dict); if (async) {