caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-22 16:18:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add redis_ prefix for member2struct, avoid redefined warning in FreeBSD (#11549)

Browse Source 
It look like it will generate a warning in FreeBSD:
```
  ./server.h:105:9: warning: 'member2struct' macro redefined [-Wmacro-redefined]
  #define member2struct(struct_name, member_name, member_addr) \
          ^
  /usr/include/sys/param.h:365:9: note: previous definition is here
  #define member2struct(s, m, x)                                          \
          ^
```

Add a `redis_` prefix to it, avoid the warning, introduced in #11511
This commit is contained in:
Binbin 2022-11-27 16:18:48 +08:00 committed by GitHub
parent 24282a381a
commit a7cecf3713
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/multi.c
View File

@ -387,7 +387,7 @@ void touchWatchedKey(redisDb *db, robj *key) {
/* Check if we are already watching for this key */ /* Check if we are already watching for this key */
listRewind(clients,&li); listRewind(clients,&li);
while((ln = listNext(&li))) { while((ln = listNext(&li))) {
watchedKey *wk = member2struct(watchedKey, node, ln); watchedKey *wk = redis_member2struct(watchedKey, node, ln);
client *c = wk->client; client *c = wk->client;
if (wk->expired) { if (wk->expired) {
@ -440,7 +440,7 @@ void touchAllWatchedKeysInDb(redisDb *emptied, redisDb *replaced_with) {
if (!clients) continue; if (!clients) continue;
listRewind(clients,&li); listRewind(clients,&li);
while((ln = listNext(&li))) { while((ln = listNext(&li))) {
watchedKey *wk = member2struct(watchedKey, node, ln); watchedKey *wk = redis_member2struct(watchedKey, node, ln);
if (wk->expired) { if (wk->expired) {
if (!replaced_with || !dictFind(replaced_with->dict, key->ptr)) { if (!replaced_with || !dictFind(replaced_with->dict, key->ptr)) {
/* Expired key now deleted. No logical change. Clear the /* Expired key now deleted. No logical change. Clear the

2
src/server.h
View File

@ -102,7 +102,7 @@ typedef struct redisObject robj;
#define max(a, b) ((a) > (b) ? (a) : (b)) #define max(a, b) ((a) > (b) ? (a) : (b))
/* Get the pointer of the outer struct from a member address */ /* Get the pointer of the outer struct from a member address */
#define member2struct(struct_name, member_name, member_addr) \ #define redis_member2struct(struct_name, member_name, member_addr) \
((struct_name *)((char*)member_addr - offsetof(struct_name, member_name))) ((struct_name *)((char*)member_addr - offsetof(struct_name, member_name)))
/* Error codes */ /* Error codes */