gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Remove unnecessary clang-format off annotations (#628)

Browse Source 
We added some clang-format off comments before we had decided on the
format configuration. Now, it turns out that turning formatting off is
often not necessary.

---------

Signed-off-by: Viktor Söderqvist <viktor.soderqvist@est.tech>
This commit is contained in:
Viktor Söderqvist 2024-06-12 03:52:18 -07:00 committed by GitHub
parent e65b2d235c
commit 4bb7cc471a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
16 changed files with 105 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/acl.c
View File

@ -1587,12 +1587,10 @@ static int ACLSelectorCheckKey(aclSelector *selector, const char *key, int keyle
listRewind(selector->patterns, &li); listRewind(selector->patterns, &li);
int key_flags = 0; int key_flags = 0;
/* clang-format off */
if (keyspec_flags & CMD_KEY_ACCESS) key_flags |= ACL_READ_PERMISSION; if (keyspec_flags & CMD_KEY_ACCESS) key_flags |= ACL_READ_PERMISSION;
if (keyspec_flags & CMD_KEY_INSERT) key_flags |= ACL_WRITE_PERMISSION; if (keyspec_flags & CMD_KEY_INSERT) key_flags |= ACL_WRITE_PERMISSION;
if (keyspec_flags & CMD_KEY_DELETE) key_flags |= ACL_WRITE_PERMISSION; if (keyspec_flags & CMD_KEY_DELETE) key_flags |= ACL_WRITE_PERMISSION;
if (keyspec_flags & CMD_KEY_UPDATE) key_flags |= ACL_WRITE_PERMISSION; if (keyspec_flags & CMD_KEY_UPDATE) key_flags |= ACL_WRITE_PERMISSION;
/* clang-format on */
/* Test this key against every pattern. */ /* Test this key against every pattern. */
while ((ln = listNext(&li))) { while ((ln = listNext(&li))) {
@ -1618,12 +1616,10 @@ static int ACLSelectorHasUnrestrictedKeyAccess(aclSelector *selector, int flags)
listRewind(selector->patterns, &li); listRewind(selector->patterns, &li);
int access_flags = 0; int access_flags = 0;
/* clang-format off */
if (flags & CMD_KEY_ACCESS) access_flags |= ACL_READ_PERMISSION; if (flags & CMD_KEY_ACCESS) access_flags |= ACL_READ_PERMISSION;
if (flags & CMD_KEY_INSERT) access_flags |= ACL_WRITE_PERMISSION; if (flags & CMD_KEY_INSERT) access_flags |= ACL_WRITE_PERMISSION;
if (flags & CMD_KEY_DELETE) access_flags |= ACL_WRITE_PERMISSION; if (flags & CMD_KEY_DELETE) access_flags |= ACL_WRITE_PERMISSION;
if (flags & CMD_KEY_UPDATE) access_flags |= ACL_WRITE_PERMISSION; if (flags & CMD_KEY_UPDATE) access_flags |= ACL_WRITE_PERMISSION;
/* clang-format on */
/* Test this key against every pattern. */ /* Test this key against every pattern. */
while ((ln = listNext(&li))) { while ((ln = listNext(&li))) {
@ -2669,15 +2665,13 @@ void addACLLogEntry(client *c, int reason, int context, int argpos, sds username
if (object) { if (object) {
le->object = object; le->object = object;
} else { } else {
/* clang-format off */ switch (reason) {
switch(reason) {
case ACL_DENIED_CMD: le->object = sdsdup(c->cmd->fullname); break; case ACL_DENIED_CMD: le->object = sdsdup(c->cmd->fullname); break;
case ACL_DENIED_KEY: le->object = sdsdup(c->argv[argpos]->ptr); break; case ACL_DENIED_KEY: le->object = sdsdup(c->argv[argpos]->ptr); break;
case ACL_DENIED_CHANNEL: le->object = sdsdup(c->argv[argpos]->ptr); break; case ACL_DENIED_CHANNEL: le->object = sdsdup(c->argv[argpos]->ptr); break;
case ACL_DENIED_AUTH: le->object = sdsdup(c->argv[0]->ptr); break; case ACL_DENIED_AUTH: le->object = sdsdup(c->argv[0]->ptr); break;
default: le->object = sdsempty(); default: le->object = sdsempty();
} }
/* clang-format on */
} }
/* if we have a real client from the network, use it (could be missing on module timers) */ /* if we have a real client from the network, use it (could be missing on module timers) */
@ -3058,28 +3052,24 @@ void aclCommand(client *c) {
addReplyBulkCString(c, "reason"); addReplyBulkCString(c, "reason");
char *reasonstr; char *reasonstr;
/* clang-format off */ switch (le->reason) {
switch(le->reason) { case ACL_DENIED_CMD: reasonstr = "command"; break;
case ACL_DENIED_CMD: reasonstr="command"; break; case ACL_DENIED_KEY: reasonstr = "key"; break;
case ACL_DENIED_KEY: reasonstr="key"; break; case ACL_DENIED_CHANNEL: reasonstr = "channel"; break;
case ACL_DENIED_CHANNEL: reasonstr="channel"; break; case ACL_DENIED_AUTH: reasonstr = "auth"; break;
case ACL_DENIED_AUTH: reasonstr="auth"; break; default: reasonstr = "unknown";
default: reasonstr="unknown";
} }
/* clang-format on */
addReplyBulkCString(c, reasonstr); addReplyBulkCString(c, reasonstr);
addReplyBulkCString(c, "context"); addReplyBulkCString(c, "context");
char *ctxstr; char *ctxstr;
/* clang-format off */ switch (le->context) {
switch(le->context) { case ACL_LOG_CTX_TOPLEVEL: ctxstr = "toplevel"; break;
case ACL_LOG_CTX_TOPLEVEL: ctxstr="toplevel"; break; case ACL_LOG_CTX_MULTI: ctxstr = "multi"; break;
case ACL_LOG_CTX_MULTI: ctxstr="multi"; break; case ACL_LOG_CTX_LUA: ctxstr = "lua"; break;
case ACL_LOG_CTX_LUA: ctxstr="lua"; break; case ACL_LOG_CTX_MODULE: ctxstr = "module"; break;
case ACL_LOG_CTX_MODULE: ctxstr="module"; break; default: ctxstr = "unknown";
default: ctxstr="unknown";
} }
/* clang-format on */
addReplyBulkCString(c, ctxstr); addReplyBulkCString(c, ctxstr);
addReplyBulkCString(c, "object"); addReplyBulkCString(c, "object");

42
src/aof.c
View File

@ -1994,21 +1994,19 @@ int rioWriteStreamPendingEntry(rio *r,
RETRYCOUNT <count> JUSTID FORCE. */ RETRYCOUNT <count> JUSTID FORCE. */
streamID id; streamID id;
streamDecodeID(rawid, &id); streamDecodeID(rawid, &id);
/* clang-format off */ if (rioWriteBulkCount(r, '*', 12) == 0) return 0;
if (rioWriteBulkCount(r,'*',12) == 0) return 0; if (rioWriteBulkString(r, "XCLAIM", 6) == 0) return 0;
if (rioWriteBulkString(r,"XCLAIM",6) == 0) return 0; if (rioWriteBulkObject(r, key) == 0) return 0;
if (rioWriteBulkObject(r,key) == 0) return 0; if (rioWriteBulkString(r, groupname, groupname_len) == 0) return 0;
if (rioWriteBulkString(r,groupname,groupname_len) == 0) return 0; if (rioWriteBulkString(r, consumer->name, sdslen(consumer->name)) == 0) return 0;
if (rioWriteBulkString(r,consumer->name,sdslen(consumer->name)) == 0) return 0; if (rioWriteBulkString(r, "0", 1) == 0) return 0;
if (rioWriteBulkString(r,"0",1) == 0) return 0; if (rioWriteBulkStreamID(r, &id) == 0) return 0;
if (rioWriteBulkStreamID(r,&id) == 0) return 0; if (rioWriteBulkString(r, "TIME", 4) == 0) return 0;
if (rioWriteBulkString(r,"TIME",4) == 0) return 0; if (rioWriteBulkLongLong(r, nack->delivery_time) == 0) return 0;
if (rioWriteBulkLongLong(r,nack->delivery_time) == 0) return 0; if (rioWriteBulkString(r, "RETRYCOUNT", 10) == 0) return 0;
if (rioWriteBulkString(r,"RETRYCOUNT",10) == 0) return 0; if (rioWriteBulkLongLong(r, nack->delivery_count) == 0) return 0;
if (rioWriteBulkLongLong(r,nack->delivery_count) == 0) return 0; if (rioWriteBulkString(r, "JUSTID", 6) == 0) return 0;
if (rioWriteBulkString(r,"JUSTID",6) == 0) return 0; if (rioWriteBulkString(r, "FORCE", 5) == 0) return 0;
if (rioWriteBulkString(r,"FORCE",5) == 0) return 0;
/* clang-format on */
return 1; return 1;
} }
@ -2021,14 +2019,12 @@ int rioWriteStreamEmptyConsumer(rio *r,
size_t groupname_len, size_t groupname_len,
streamConsumer *consumer) { streamConsumer *consumer) {
/* XGROUP CREATECONSUMER <key> <group> <consumer> */ /* XGROUP CREATECONSUMER <key> <group> <consumer> */
/* clang-format off */ if (rioWriteBulkCount(r, '*', 5) == 0) return 0;
if (rioWriteBulkCount(r,'*',5) == 0) return 0; if (rioWriteBulkString(r, "XGROUP", 6) == 0) return 0;
if (rioWriteBulkString(r,"XGROUP",6) == 0) return 0; if (rioWriteBulkString(r, "CREATECONSUMER", 14) == 0) return 0;
if (rioWriteBulkString(r,"CREATECONSUMER",14) == 0) return 0; if (rioWriteBulkObject(r, key) == 0) return 0;
if (rioWriteBulkObject(r,key) == 0) return 0; if (rioWriteBulkString(r, groupname, groupname_len) == 0) return 0;
if (rioWriteBulkString(r,groupname,groupname_len) == 0) return 0; if (rioWriteBulkString(r, consumer->name, sdslen(consumer->name)) == 0) return 0;
if (rioWriteBulkString(r,consumer->name,sdslen(consumer->name)) == 0) return 0;
/* clang-format on */
return 1; return 1;
} }

24
src/eval.c
View File

@ -1221,20 +1221,18 @@ char *ldbRespToHuman_Double(sds *o, char *reply);
* char*) so that we can return a modified pointer, as for SDS semantics. */ * char*) so that we can return a modified pointer, as for SDS semantics. */
char *ldbRespToHuman(sds *o, char *reply) { char *ldbRespToHuman(sds *o, char *reply) {
char *p = reply; char *p = reply;
/* clang-format off */ switch (*p) {
switch(*p) { case ':': p = ldbRespToHuman_Int(o, reply); break;
case ':': p = ldbRespToHuman_Int(o,reply); break; case '$': p = ldbRespToHuman_Bulk(o, reply); break;
case '$': p = ldbRespToHuman_Bulk(o,reply); break; case '+': p = ldbRespToHuman_Status(o, reply); break;
case '+': p = ldbRespToHuman_Status(o,reply); break; case '-': p = ldbRespToHuman_Status(o, reply); break;
case '-': p = ldbRespToHuman_Status(o,reply); break; case '*': p = ldbRespToHuman_MultiBulk(o, reply); break;
case '*': p = ldbRespToHuman_MultiBulk(o,reply); break; case '~': p = ldbRespToHuman_Set(o, reply); break;
case '~': p = ldbRespToHuman_Set(o,reply); break; case '%': p = ldbRespToHuman_Map(o, reply); break;
case '%': p = ldbRespToHuman_Map(o,reply); break; case '_': p = ldbRespToHuman_Null(o, reply); break;
case '_': p = ldbRespToHuman_Null(o,reply); break; case '#': p = ldbRespToHuman_Bool(o, reply); break;
case '#': p = ldbRespToHuman_Bool(o,reply); break; case ',': p = ldbRespToHuman_Double(o, reply); break;
case ',': p = ldbRespToHuman_Double(o,reply); break;
} }
/* clang-format on */
return p; return p;
} }

10
src/listpack.c
View File

@ -427,19 +427,17 @@ static inline void lpEncodeString(unsigned char *buf, unsigned char *s, uint32_t
* lpCurrentEncodedSizeBytes or ASSERT_INTEGRITY_LEN (possibly since 'p' is * lpCurrentEncodedSizeBytes or ASSERT_INTEGRITY_LEN (possibly since 'p' is
* a return value of another function that validated its return. */ * a return value of another function that validated its return. */
static inline uint32_t lpCurrentEncodedSizeUnsafe(unsigned char *p) { static inline uint32_t lpCurrentEncodedSizeUnsafe(unsigned char *p) {
/* clang-format off */
if (LP_ENCODING_IS_7BIT_UINT(p[0])) return 1; if (LP_ENCODING_IS_7BIT_UINT(p[0])) return 1;
if (LP_ENCODING_IS_6BIT_STR(p[0])) return 1+LP_ENCODING_6BIT_STR_LEN(p); if (LP_ENCODING_IS_6BIT_STR(p[0])) return 1 + LP_ENCODING_6BIT_STR_LEN(p);
if (LP_ENCODING_IS_13BIT_INT(p[0])) return 2; if (LP_ENCODING_IS_13BIT_INT(p[0])) return 2;
if (LP_ENCODING_IS_16BIT_INT(p[0])) return 3; if (LP_ENCODING_IS_16BIT_INT(p[0])) return 3;
if (LP_ENCODING_IS_24BIT_INT(p[0])) return 4; if (LP_ENCODING_IS_24BIT_INT(p[0])) return 4;
if (LP_ENCODING_IS_32BIT_INT(p[0])) return 5; if (LP_ENCODING_IS_32BIT_INT(p[0])) return 5;
if (LP_ENCODING_IS_64BIT_INT(p[0])) return 9; if (LP_ENCODING_IS_64BIT_INT(p[0])) return 9;
if (LP_ENCODING_IS_12BIT_STR(p[0])) return 2+LP_ENCODING_12BIT_STR_LEN(p); if (LP_ENCODING_IS_12BIT_STR(p[0])) return 2 + LP_ENCODING_12BIT_STR_LEN(p);
if (LP_ENCODING_IS_32BIT_STR(p[0])) return 5+LP_ENCODING_32BIT_STR_LEN(p); if (LP_ENCODING_IS_32BIT_STR(p[0])) return 5 + LP_ENCODING_32BIT_STR_LEN(p);
if (p[0] == LP_EOF) return 1; if (p[0] == LP_EOF) return 1;
return 0; return 0;
/* clang-format on */
} }
/* Return bytes needed to encode the length of the listpack element pointed by 'p'. /* Return bytes needed to encode the length of the listpack element pointed by 'p'.
@ -447,7 +445,6 @@ static inline uint32_t lpCurrentEncodedSizeUnsafe(unsigned char *p) {
* of the element (excluding the element data itself) * of the element (excluding the element data itself)
* If the element encoding is wrong then 0 is returned. */ * If the element encoding is wrong then 0 is returned. */
static inline uint32_t lpCurrentEncodedSizeBytes(unsigned char *p) { static inline uint32_t lpCurrentEncodedSizeBytes(unsigned char *p) {
/* clang-format off */
if (LP_ENCODING_IS_7BIT_UINT(p[0])) return 1; if (LP_ENCODING_IS_7BIT_UINT(p[0])) return 1;
if (LP_ENCODING_IS_6BIT_STR(p[0])) return 1; if (LP_ENCODING_IS_6BIT_STR(p[0])) return 1;
if (LP_ENCODING_IS_13BIT_INT(p[0])) return 1; if (LP_ENCODING_IS_13BIT_INT(p[0])) return 1;
@ -459,7 +456,6 @@ static inline uint32_t lpCurrentEncodedSizeBytes(unsigned char *p) {
if (LP_ENCODING_IS_32BIT_STR(p[0])) return 5; if (LP_ENCODING_IS_32BIT_STR(p[0])) return 5;
if (p[0] == LP_EOF) return 1; if (p[0] == LP_EOF) return 1;
return 0; return 0;
/* clang-format on */
} }
/* Skip the current entry returning the next. It is invalid to call this /* Skip the current entry returning the next. It is invalid to call this

8
src/networking.c
View File

@ -2843,7 +2843,6 @@ sds catClientInfoString(sds s, client *client) {
else else
*p++ = 'S'; *p++ = 'S';
} }
/* clang-format off */
if (client->flags & CLIENT_PRIMARY) *p++ = 'M'; if (client->flags & CLIENT_PRIMARY) *p++ = 'M';
if (client->flags & CLIENT_PUBSUB) *p++ = 'P'; if (client->flags & CLIENT_PUBSUB) *p++ = 'P';
if (client->flags & CLIENT_MULTI) *p++ = 'x'; if (client->flags & CLIENT_MULTI) *p++ = 'x';
@ -2860,7 +2859,6 @@ sds catClientInfoString(sds s, client *client) {
if (client->flags & CLIENT_NO_EVICT) *p++ = 'e'; if (client->flags & CLIENT_NO_EVICT) *p++ = 'e';
if (client->flags & CLIENT_NO_TOUCH) *p++ = 'T'; if (client->flags & CLIENT_NO_TOUCH) *p++ = 'T';
if (p == flags) *p++ = 'N'; if (p == flags) *p++ = 'N';
/* clang-format on */
*p++ = '\0'; *p++ = '\0';
p = events; p = events;
@ -3269,15 +3267,13 @@ NULL
listRewind(server.clients, &li); listRewind(server.clients, &li);
while ((ln = listNext(&li)) != NULL) { while ((ln = listNext(&li)) != NULL) {
client *client = listNodeValue(ln); client *client = listNodeValue(ln);
/* clang-format off */ if (addr && strcmp(getClientPeerId(client), addr) != 0) continue;
if (addr && strcmp(getClientPeerId(client),addr) != 0) continue; if (laddr && strcmp(getClientSockname(client), laddr) != 0) continue;
if (laddr && strcmp(getClientSockname(client),laddr) != 0) continue;
if (type != -1 && getClientType(client) != type) continue; if (type != -1 && getClientType(client) != type) continue;
if (id != 0 && client->id != id) continue; if (id != 0 && client->id != id) continue;
if (user && client->user != user) continue; if (user && client->user != user) continue;
if (c == client && skipme) continue; if (c == client && skipme) continue;
if (max_age != 0 && (long long)(commandTimeSnapshot() / 1000 - client->ctime) < max_age) continue; if (max_age != 0 && (long long)(commandTimeSnapshot() / 1000 - client->ctime) < max_age) continue;
/* clang-format on */
/* Kill it. */ /* Kill it. */
if (c == client) { if (c == client) {

36
src/notify.c
View File

@ -42,8 +42,7 @@ int keyspaceEventsStringToFlags(char *classes) {
int c, flags = 0; int c, flags = 0;
while ((c = *p++) != '\0') { while ((c = *p++) != '\0') {
/* clang-format off */ switch (c) {
switch(c) {
case 'A': flags |= NOTIFY_ALL; break; case 'A': flags |= NOTIFY_ALL; break;
case 'g': flags |= NOTIFY_GENERIC; break; case 'g': flags |= NOTIFY_GENERIC; break;
case '$': flags |= NOTIFY_STRING; break; case '$': flags |= NOTIFY_STRING; break;
@ -61,7 +60,6 @@ int keyspaceEventsStringToFlags(char *classes) {
case 'n': flags |= NOTIFY_NEW; break; case 'n': flags |= NOTIFY_NEW; break;
default: return -1; default: return -1;
} }
/* clang-format on */
} }
return flags; return flags;
} }
@ -73,28 +71,26 @@ int keyspaceEventsStringToFlags(char *classes) {
sds keyspaceEventsFlagsToString(int flags) { sds keyspaceEventsFlagsToString(int flags) {
sds res; sds res;
/* clang-format off */
res = sdsempty(); res = sdsempty();
if ((flags & NOTIFY_ALL) == NOTIFY_ALL) { if ((flags & NOTIFY_ALL) == NOTIFY_ALL) {
res = sdscatlen(res,"A",1); res = sdscatlen(res, "A", 1);
} else { } else {
if (flags & NOTIFY_GENERIC) res = sdscatlen(res,"g",1); if (flags & NOTIFY_GENERIC) res = sdscatlen(res, "g", 1);
if (flags & NOTIFY_STRING) res = sdscatlen(res,"$",1); if (flags & NOTIFY_STRING) res = sdscatlen(res, "$", 1);
if (flags & NOTIFY_LIST) res = sdscatlen(res,"l",1); if (flags & NOTIFY_LIST) res = sdscatlen(res, "l", 1);
if (flags & NOTIFY_SET) res = sdscatlen(res,"s",1); if (flags & NOTIFY_SET) res = sdscatlen(res, "s", 1);
if (flags & NOTIFY_HASH) res = sdscatlen(res,"h",1); if (flags & NOTIFY_HASH) res = sdscatlen(res, "h", 1);
if (flags & NOTIFY_ZSET) res = sdscatlen(res,"z",1); if (flags & NOTIFY_ZSET) res = sdscatlen(res, "z", 1);
if (flags & NOTIFY_EXPIRED) res = sdscatlen(res,"x",1); if (flags & NOTIFY_EXPIRED) res = sdscatlen(res, "x", 1);
if (flags & NOTIFY_EVICTED) res = sdscatlen(res,"e",1); if (flags & NOTIFY_EVICTED) res = sdscatlen(res, "e", 1);
if (flags & NOTIFY_STREAM) res = sdscatlen(res,"t",1); if (flags & NOTIFY_STREAM) res = sdscatlen(res, "t", 1);
if (flags & NOTIFY_MODULE) res = sdscatlen(res,"d",1); if (flags & NOTIFY_MODULE) res = sdscatlen(res, "d", 1);
if (flags & NOTIFY_NEW) res = sdscatlen(res,"n",1); if (flags & NOTIFY_NEW) res = sdscatlen(res, "n", 1);
} }
if (flags & NOTIFY_KEYSPACE) res = sdscatlen(res,"K",1); if (flags & NOTIFY_KEYSPACE) res = sdscatlen(res, "K", 1);
if (flags & NOTIFY_KEYEVENT) res = sdscatlen(res,"E",1); if (flags & NOTIFY_KEYEVENT) res = sdscatlen(res, "E", 1);
if (flags & NOTIFY_KEY_MISS) res = sdscatlen(res,"m",1); if (flags & NOTIFY_KEY_MISS) res = sdscatlen(res, "m", 1);
return res; return res;
/* clang-format on */
} }
/* The API provided to the rest of the serer core is a simple function: /* The API provided to the rest of the serer core is a simple function:

12
src/object.c
View File

@ -372,8 +372,7 @@ void incrRefCount(robj *o) {
void decrRefCount(robj *o) { void decrRefCount(robj *o) {
if (o->refcount == 1) { if (o->refcount == 1) {
/* clang-format off */ switch (o->type) {
switch(o->type) {
case OBJ_STRING: freeStringObject(o); break; case OBJ_STRING: freeStringObject(o); break;
case OBJ_LIST: freeListObject(o); break; case OBJ_LIST: freeListObject(o); break;
case OBJ_SET: freeSetObject(o); break; case OBJ_SET: freeSetObject(o); break;
@ -383,7 +382,6 @@ void decrRefCount(robj *o) {
case OBJ_STREAM: freeStreamObject(o); break; case OBJ_STREAM: freeStreamObject(o); break;
default: serverPanic("Unknown object type"); break; default: serverPanic("Unknown object type"); break;
} }
/* clang-format on */
zfree(o); zfree(o);
} else { } else {
if (o->refcount <= 0) serverPanic("decrRefCount against refcount <= 0"); if (o->refcount <= 0) serverPanic("decrRefCount against refcount <= 0");
@ -552,8 +550,7 @@ void dismissObject(robj *o, size_t size_hint) {
* so we avoid these pointless loops when they're not going to do anything. */ * so we avoid these pointless loops when they're not going to do anything. */
#if defined(USE_JEMALLOC) && defined(__linux__) #if defined(USE_JEMALLOC) && defined(__linux__)
if (o->refcount != 1) return; if (o->refcount != 1) return;
/* clang-format off */ switch (o->type) {
switch(o->type) {
case OBJ_STRING: dismissStringObject(o); break; case OBJ_STRING: dismissStringObject(o); break;
case OBJ_LIST: dismissListObject(o, size_hint); break; case OBJ_LIST: dismissListObject(o, size_hint); break;
case OBJ_SET: dismissSetObject(o, size_hint); break; case OBJ_SET: dismissSetObject(o, size_hint); break;
@ -562,7 +559,6 @@ void dismissObject(robj *o, size_t size_hint) {
case OBJ_STREAM: dismissStreamObject(o, size_hint); break; case OBJ_STREAM: dismissStreamObject(o, size_hint); break;
default: break; default: break;
} }
/* clang-format on */
#else #else
UNUSED(o); UNUSED(o);
UNUSED(size_hint); UNUSED(size_hint);
@ -930,8 +926,7 @@ int getIntFromObjectOrReply(client *c, robj *o, int *target, const char *msg) {
} }
char *strEncoding(int encoding) { char *strEncoding(int encoding) {
/* clang-format off */ switch (encoding) {
switch(encoding) {
case OBJ_ENCODING_RAW: return "raw"; case OBJ_ENCODING_RAW: return "raw";
case OBJ_ENCODING_INT: return "int"; case OBJ_ENCODING_INT: return "int";
case OBJ_ENCODING_HT: return "hashtable"; case OBJ_ENCODING_HT: return "hashtable";
@ -943,7 +938,6 @@ char *strEncoding(int encoding) {
case OBJ_ENCODING_STREAM: return "stream"; case OBJ_ENCODING_STREAM: return "stream";
default: return "unknown"; default: return "unknown";
} }
/* clang-format on */
} }
/* =========================== Memory introspection ========================= */ /* =========================== Memory introspection ========================= */

4
src/replication.c
View File

@ -3149,8 +3149,7 @@ void roleCommand(client *c) {
if (replicaIsInHandshakeState()) { if (replicaIsInHandshakeState()) {
replica_state = "handshake"; replica_state = "handshake";
} else { } else {
/* clang-format off */ switch (server.repl_state) {
switch(server.repl_state) {
case REPL_STATE_NONE: replica_state = "none"; break; case REPL_STATE_NONE: replica_state = "none"; break;
case REPL_STATE_CONNECT: replica_state = "connect"; break; case REPL_STATE_CONNECT: replica_state = "connect"; break;
case REPL_STATE_CONNECTING: replica_state = "connecting"; break; case REPL_STATE_CONNECTING: replica_state = "connecting"; break;
@ -3158,7 +3157,6 @@ void roleCommand(client *c) {
case REPL_STATE_CONNECTED: replica_state = "connected"; break; case REPL_STATE_CONNECTED: replica_state = "connected"; break;
default: replica_state = "unknown"; break; default: replica_state = "unknown"; break;
} }
/* clang-format on */
} }
addReplyBulkCString(c, replica_state); addReplyBulkCString(c, replica_state);
addReplyLongLong(c, server.primary ? server.primary->reploff : -1); addReplyLongLong(c, server.primary ? server.primary->reploff : -1);

5
src/resp_parser.c
View File

@ -209,7 +209,6 @@ static int parseMap(ReplyParser *parser, void *p_ctx) {
/* Parse a reply pointed to by parser->curr_location. */ /* Parse a reply pointed to by parser->curr_location. */
int parseReply(ReplyParser *parser, void *p_ctx) { int parseReply(ReplyParser *parser, void *p_ctx) {
/* clang-format off */
switch (parser->curr_location[0]) { switch (parser->curr_location[0]) {
case '$': return parseBulk(parser, p_ctx); case '$': return parseBulk(parser, p_ctx);
case '+': return parseSimpleString(parser, p_ctx); case '+': return parseSimpleString(parser, p_ctx);
@ -224,8 +223,8 @@ int parseReply(ReplyParser *parser, void *p_ctx) {
case '(': return parseBigNumber(parser, p_ctx); case '(': return parseBigNumber(parser, p_ctx);
case '=': return parseVerbatimString(parser, p_ctx); case '=': return parseVerbatimString(parser, p_ctx);
case '|': return parseAttributes(parser, p_ctx); case '|': return parseAttributes(parser, p_ctx);
default: if (parser->callbacks.error) parser->callbacks.error(p_ctx); default:
if (parser->callbacks.error) parser->callbacks.error(p_ctx);
} }
/* clang-format on */
return C_ERR; return C_ERR;
} }

22
src/sds.c
View File

@ -986,8 +986,7 @@ int is_hex_digit(char c) {
/* Helper function for sdssplitargs() that converts a hex digit into an /* Helper function for sdssplitargs() that converts a hex digit into an
* integer from 0 to 15 */ * integer from 0 to 15 */
int hex_digit_to_int(char c) { int hex_digit_to_int(char c) {
/* clang-format off */ switch (c) {
switch(c) {
case '0': return 0; case '0': return 0;
case '1': return 1; case '1': return 1;
case '2': return 2; case '2': return 2;
@ -998,15 +997,20 @@ int hex_digit_to_int(char c) {
case '7': return 7; case '7': return 7;
case '8': return 8; case '8': return 8;
case '9': return 9; case '9': return 9;
case 'a': case 'A': return 10; case 'a':
case 'b': case 'B': return 11; case 'A': return 10;
case 'c': case 'C': return 12; case 'b':
case 'd': case 'D': return 13; case 'B': return 11;
case 'e': case 'E': return 14; case 'c':
case 'f': case 'F': return 15; case 'C': return 12;
case 'd':
case 'D': return 13;
case 'e':
case 'E': return 14;
case 'f':
case 'F': return 15;
default: return 0; default: return 0;
} }
/* clang-format on */
} }
/* Split a line into arguments, where every argument can be in the /* Split a line into arguments, where every argument can be in the

40
src/sentinel.c
View File

@ -3015,15 +3015,13 @@ static void populateDict(dict *options_dict, char **options) {
} }
const char *getLogLevel(void) { const char *getLogLevel(void) {
/* clang-format off */ switch (server.verbosity) {
switch (server.verbosity) {
case LL_DEBUG: return "debug"; case LL_DEBUG: return "debug";
case LL_VERBOSE: return "verbose"; case LL_VERBOSE: return "verbose";
case LL_NOTICE: return "notice"; case LL_NOTICE: return "notice";
case LL_WARNING: return "warning"; case LL_WARNING: return "warning";
case LL_NOTHING: return "nothing"; case LL_NOTHING: return "nothing";
} }
/* clang-format on */
return "unknown"; return "unknown";
} }
@ -3203,8 +3201,7 @@ void sentinelConfigGetCommand(client *c) {
} }
const char *sentinelFailoverStateStr(int state) { const char *sentinelFailoverStateStr(int state) {
/* clang-format off */ switch (state) {
switch(state) {
case SENTINEL_FAILOVER_STATE_NONE: return "none"; case SENTINEL_FAILOVER_STATE_NONE: return "none";
case SENTINEL_FAILOVER_STATE_WAIT_START: return "wait_start"; case SENTINEL_FAILOVER_STATE_WAIT_START: return "wait_start";
case SENTINEL_FAILOVER_STATE_SELECT_REPLICA: return "select_slave"; case SENTINEL_FAILOVER_STATE_SELECT_REPLICA: return "select_slave";
@ -3214,7 +3211,6 @@ const char *sentinelFailoverStateStr(int state) {
case SENTINEL_FAILOVER_STATE_UPDATE_CONFIG: return "update_config"; case SENTINEL_FAILOVER_STATE_UPDATE_CONFIG: return "update_config";
default: return "unknown"; default: return "unknown";
} }
/* clang-format on */
} }
/* Server instance to RESP representation. */ /* Server instance to RESP representation. */
@ -3242,23 +3238,21 @@ void addReplySentinelRedisInstance(client *c, sentinelRedisInstance *ri) {
fields++; fields++;
addReplyBulkCString(c, "flags"); addReplyBulkCString(c, "flags");
/* clang-format off */ if (ri->flags & SRI_S_DOWN) flags = sdscat(flags, "s_down,");
if (ri->flags & SRI_S_DOWN) flags = sdscat(flags,"s_down,"); if (ri->flags & SRI_O_DOWN) flags = sdscat(flags, "o_down,");
if (ri->flags & SRI_O_DOWN) flags = sdscat(flags,"o_down,"); if (ri->flags & SRI_PRIMARY) flags = sdscat(flags, "master,");
if (ri->flags & SRI_PRIMARY) flags = sdscat(flags,"master,"); if (ri->flags & SRI_REPLICA) flags = sdscat(flags, "slave,");
if (ri->flags & SRI_REPLICA) flags = sdscat(flags,"slave,"); if (ri->flags & SRI_SENTINEL) flags = sdscat(flags, "sentinel,");
if (ri->flags & SRI_SENTINEL) flags = sdscat(flags,"sentinel,"); if (ri->link->disconnected) flags = sdscat(flags, "disconnected,");
if (ri->link->disconnected) flags = sdscat(flags,"disconnected,"); if (ri->flags & SRI_PRIMARY_DOWN) flags = sdscat(flags, "master_down,");
if (ri->flags & SRI_PRIMARY_DOWN) flags = sdscat(flags,"master_down,"); if (ri->flags & SRI_FAILOVER_IN_PROGRESS) flags = sdscat(flags, "failover_in_progress,");
if (ri->flags & SRI_FAILOVER_IN_PROGRESS) flags = sdscat(flags,"failover_in_progress,"); if (ri->flags & SRI_PROMOTED) flags = sdscat(flags, "promoted,");
if (ri->flags & SRI_PROMOTED) flags = sdscat(flags,"promoted,"); if (ri->flags & SRI_RECONF_SENT) flags = sdscat(flags, "reconf_sent,");
if (ri->flags & SRI_RECONF_SENT) flags = sdscat(flags,"reconf_sent,"); if (ri->flags & SRI_RECONF_INPROG) flags = sdscat(flags, "reconf_inprog,");
if (ri->flags & SRI_RECONF_INPROG) flags = sdscat(flags,"reconf_inprog,"); if (ri->flags & SRI_RECONF_DONE) flags = sdscat(flags, "reconf_done,");
if (ri->flags & SRI_RECONF_DONE) flags = sdscat(flags,"reconf_done,"); if (ri->flags & SRI_FORCE_FAILOVER) flags = sdscat(flags, "force_failover,");
if (ri->flags & SRI_FORCE_FAILOVER) flags = sdscat(flags,"force_failover,"); if (ri->flags & SRI_SCRIPT_KILL_SENT) flags = sdscat(flags, "script_kill_sent,");
if (ri->flags & SRI_SCRIPT_KILL_SENT) flags = sdscat(flags,"script_kill_sent,"); if (ri->flags & SRI_PRIMARY_REBOOT) flags = sdscat(flags, "master_reboot,");
if (ri->flags & SRI_PRIMARY_REBOOT) flags = sdscat(flags,"master_reboot,");
/* clang-format on */
if (sdslen(flags) != 0) sdsrange(flags, 0, -2); /* remove last "," */ if (sdslen(flags) != 0) sdsrange(flags, 0, -2); /* remove last "," */
addReplyBulkCString(c, flags); addReplyBulkCString(c, flags);

4
src/server.c
View File

@ -614,15 +614,13 @@ void updateDictResizePolicy(void) {
} }
const char *strChildType(int type) { const char *strChildType(int type) {
/* clang-format off */ switch (type) {
switch(type) {
case CHILD_TYPE_RDB: return "RDB"; case CHILD_TYPE_RDB: return "RDB";
case CHILD_TYPE_AOF: return "AOF"; case CHILD_TYPE_AOF: return "AOF";
case CHILD_TYPE_LDB: return "LDB"; case CHILD_TYPE_LDB: return "LDB";
case CHILD_TYPE_MODULE: return "MODULE"; case CHILD_TYPE_MODULE: return "MODULE";
default: return "Unknown"; default: return "Unknown";
} }
/* clang-format on */
} }
/* Return true if there are active children processes doing RDB saving, /* Return true if there are active children processes doing RDB saving,

2
src/util.c
View File

@ -1251,7 +1251,6 @@ static char *i2string_async_signal_safe(int base, int64_t val, char *buf) {
int ix; int ix;
buf = orig_buf - 1; buf = orig_buf - 1;
for (ix = 0; ix < 16; ++ix, --buf) { for (ix = 0; ix < 16; ++ix, --buf) {
/* clang-format off */
switch (*buf) { switch (*buf) {
case '0': *buf = 'f'; break; case '0': *buf = 'f'; break;
case '1': *buf = 'e'; break; case '1': *buf = 'e'; break;
@ -1270,7 +1269,6 @@ static char *i2string_async_signal_safe(int base, int64_t val, char *buf) {
case 'e': *buf = '1'; break; case 'e': *buf = '1'; break;
case 'f': *buf = '0'; break; case 'f': *buf = '0'; break;
} }
/* clang-format on */
} }
} }
return buf + 1; return buf + 1;

4
src/valkey-benchmark.c
View File

@ -1098,14 +1098,12 @@ static int fetchClusterConfiguration(void) {
*p = '\0'; *p = '\0';
char *token = line; char *token = line;
line = p + 1; line = p + 1;
/* clang-format off */ switch (i++) {
switch(i++){
case 0: name = token; break; case 0: name = token; break;
case 1: addr = token; break; case 1: addr = token; break;
case 2: flags = token; break; case 2: flags = token; break;
case 3: primary_id = token; break; case 3: primary_id = token; break;
} }
/* clang-format on */
if (i == 8) break; // Slots if (i == 8) break; // Slots
} }
if (!flags) { if (!flags) {

4
src/valkey-cli.c
View File

@ -5141,8 +5141,7 @@ static int clusterManagerNodeLoadInfo(clusterManagerNode *node, int opts, char *
*p = '\0'; *p = '\0';
char *token = line; char *token = line;
line = p + 1; line = p + 1;
/* clang-format off */ switch (i++) {
switch(i++){
case 0: name = token; break; case 0: name = token; break;
case 1: addr = token; break; case 1: addr = token; break;
case 2: flags = token; break; case 2: flags = token; break;
@ -5152,7 +5151,6 @@ static int clusterManagerNodeLoadInfo(clusterManagerNode *node, int opts, char *
case 6: config_epoch = token; break; case 6: config_epoch = token; break;
case 7: link_status = token; break; case 7: link_status = token; break;
} }
/* clang-format on */
if (i == 8) break; // Slots if (i == 8) break; // Slots
} }
if (!flags) { if (!flags) {

6
src/ziplist.c
View File

@ -340,15 +340,13 @@ static inline unsigned int zipEncodingLenSize(unsigned char encoding) {
/* Return bytes needed to store integer encoded by 'encoding' */ /* Return bytes needed to store integer encoded by 'encoding' */
static inline unsigned int zipIntSize(unsigned char encoding) { static inline unsigned int zipIntSize(unsigned char encoding) {
/* clang-format off */ switch (encoding) {
switch(encoding) { case ZIP_INT_8B: return 1;
case ZIP_INT_8B: return 1;
case ZIP_INT_16B: return 2; case ZIP_INT_16B: return 2;
case ZIP_INT_24B: return 3; case ZIP_INT_24B: return 3;
case ZIP_INT_32B: return 4; case ZIP_INT_32B: return 4;
case ZIP_INT_64B: return 8; case ZIP_INT_64B: return 8;
} }
/* clang-format on */
if (encoding >= ZIP_INT_IMM_MIN && encoding <= ZIP_INT_IMM_MAX) return 0; /* 4 bit immediate */ if (encoding >= ZIP_INT_IMM_MIN && encoding <= ZIP_INT_IMM_MAX) return 0; /* 4 bit immediate */
/* bad encoding, covered by a previous call to ZIP_ASSERT_ENCODING */ /* bad encoding, covered by a previous call to ZIP_ASSERT_ENCODING */
valkey_unreachable(); valkey_unreachable();