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

10
src/acl.c
View File

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

4
src/aof.c
View File

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

2
src/eval.c
View File

@ -1221,7 +1221,6 @@ char *ldbRespToHuman_Double(sds *o, char *reply);
* char*) so that we can return a modified pointer, as for SDS semantics. */
char *ldbRespToHuman(sds *o, char *reply) {
char *p = reply;
/* clang-format off */
switch (*p) {
case ':': p = ldbRespToHuman_Int(o, reply); break;
case '$': p = ldbRespToHuman_Bulk(o, reply); break;
@ -1234,7 +1233,6 @@ char *ldbRespToHuman(sds *o, char *reply) {
case '#': p = ldbRespToHuman_Bool(o, reply); break;
case ',': p = ldbRespToHuman_Double(o, reply); break;
}
/* clang-format on */
return p;
}

4
src/listpack.c
View File

@ -427,7 +427,6 @@ static inline void lpEncodeString(unsigned char *buf, unsigned char *s, uint32_t
* lpCurrentEncodedSizeBytes or ASSERT_INTEGRITY_LEN (possibly since 'p' is
* a return value of another function that validated its return. */
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_6BIT_STR(p[0])) return 1 + LP_ENCODING_6BIT_STR_LEN(p);
if (LP_ENCODING_IS_13BIT_INT(p[0])) return 2;
@ -439,7 +438,6 @@ static inline uint32_t lpCurrentEncodedSizeUnsafe(unsigned char *p) {
if (LP_ENCODING_IS_32BIT_STR(p[0])) return 5 + LP_ENCODING_32BIT_STR_LEN(p);
if (p[0] == LP_EOF) return 1;
return 0;
/* clang-format on */
}
/* 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)
* If the element encoding is wrong then 0 is returned. */
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_6BIT_STR(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 (p[0] == LP_EOF) return 1;
return 0;
/* clang-format on */
}
/* Skip the current entry returning the next. It is invalid to call this

4
src/networking.c
View File

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

4
src/notify.c
View File

@ -42,7 +42,6 @@ int keyspaceEventsStringToFlags(char *classes) {
int c, flags = 0;
while ((c = *p++) != '\0') {
/* clang-format off */
switch (c) {
case 'A': flags |= NOTIFY_ALL; break;
case 'g': flags |= NOTIFY_GENERIC; break;
@ -61,7 +60,6 @@ int keyspaceEventsStringToFlags(char *classes) {
case 'n': flags |= NOTIFY_NEW; break;
default: return -1;
}
/* clang-format on */
}
return flags;
}
@ -73,7 +71,6 @@ int keyspaceEventsStringToFlags(char *classes) {
sds keyspaceEventsFlagsToString(int flags) {
sds res;
/* clang-format off */
res = sdsempty();
if ((flags & NOTIFY_ALL) == NOTIFY_ALL) {
res = sdscatlen(res, "A", 1);
@ -94,7 +91,6 @@ sds keyspaceEventsFlagsToString(int flags) {
if (flags & NOTIFY_KEYEVENT) res = sdscatlen(res, "E", 1);
if (flags & NOTIFY_KEY_MISS) res = sdscatlen(res, "m", 1);
return res;
/* clang-format on */
}
/* The API provided to the rest of the serer core is a simple function:

6
src/object.c
View File

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

2
src/replication.c
View File

@ -3149,7 +3149,6 @@ void roleCommand(client *c) {
if (replicaIsInHandshakeState()) {
replica_state = "handshake";
} else {
/* clang-format off */
switch (server.repl_state) {
case REPL_STATE_NONE: replica_state = "none"; break;
case REPL_STATE_CONNECT: replica_state = "connect"; break;
@ -3158,7 +3157,6 @@ void roleCommand(client *c) {
case REPL_STATE_CONNECTED: replica_state = "connected"; break;
default: replica_state = "unknown"; break;
}
/* clang-format on */
}
addReplyBulkCString(c, replica_state);
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. */
int parseReply(ReplyParser *parser, void *p_ctx) {
/* clang-format off */
switch (parser->curr_location[0]) {
case '$': return parseBulk(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 parseVerbatimString(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;
}

20
src/sds.c
View File

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

6
src/sentinel.c
View File

@ -3015,7 +3015,6 @@ static void populateDict(dict *options_dict, char **options) {
}
const char *getLogLevel(void) {
/* clang-format off */
switch (server.verbosity) {
case LL_DEBUG: return "debug";
case LL_VERBOSE: return "verbose";
@ -3023,7 +3022,6 @@ const char *getLogLevel(void) {
case LL_WARNING: return "warning";
case LL_NOTHING: return "nothing";
}
/* clang-format on */
return "unknown";
}
@ -3203,7 +3201,6 @@ void sentinelConfigGetCommand(client *c) {
}
const char *sentinelFailoverStateStr(int state) {
/* clang-format off */
switch (state) {
case SENTINEL_FAILOVER_STATE_NONE: return "none";
case SENTINEL_FAILOVER_STATE_WAIT_START: return "wait_start";
@ -3214,7 +3211,6 @@ const char *sentinelFailoverStateStr(int state) {
case SENTINEL_FAILOVER_STATE_UPDATE_CONFIG: return "update_config";
default: return "unknown";
}
/* clang-format on */
}
/* Server instance to RESP representation. */
@ -3242,7 +3238,6 @@ void addReplySentinelRedisInstance(client *c, sentinelRedisInstance *ri) {
fields++;
addReplyBulkCString(c, "flags");
/* clang-format off */
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_PRIMARY) flags = sdscat(flags, "master,");
@ -3258,7 +3253,6 @@ void addReplySentinelRedisInstance(client *c, sentinelRedisInstance *ri) {
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_PRIMARY_REBOOT) flags = sdscat(flags, "master_reboot,");
/* clang-format on */
if (sdslen(flags) != 0) sdsrange(flags, 0, -2); /* remove last "," */
addReplyBulkCString(c, flags);

2
src/server.c
View File

@ -614,7 +614,6 @@ void updateDictResizePolicy(void) {
}
const char *strChildType(int type) {
/* clang-format off */
switch (type) {
case CHILD_TYPE_RDB: return "RDB";
case CHILD_TYPE_AOF: return "AOF";
@ -622,7 +621,6 @@ const char *strChildType(int type) {
case CHILD_TYPE_MODULE: return "MODULE";
default: return "Unknown";
}
/* clang-format on */
}
/* 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;
buf = orig_buf - 1;
for (ix = 0; ix < 16; ++ix, --buf) {
/* clang-format off */
switch (*buf) {
case '0': *buf = 'f'; 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 'f': *buf = '0'; break;
}
/* clang-format on */
}
}
return buf + 1;

2
src/valkey-benchmark.c
View File

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

2
src/valkey-cli.c
View File

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

2
src/ziplist.c
View File

@ -340,7 +340,6 @@ static inline unsigned int zipEncodingLenSize(unsigned char encoding) {
/* Return bytes needed to store integer encoded by 'encoding' */
static inline unsigned int zipIntSize(unsigned char encoding) {
/* clang-format off */
switch (encoding) {
case ZIP_INT_8B: return 1;
case ZIP_INT_16B: return 2;
@ -348,7 +347,6 @@ static inline unsigned int zipIntSize(unsigned char encoding) {
case ZIP_INT_32B: return 4;
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 */
/* bad encoding, covered by a previous call to ZIP_ASSERT_ENCODING */
valkey_unreachable();