root
/
redis
mirror of https://github.com/redis/redis.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Fix redundancy use of semicolon in do-while macros in ziplist.c. (#7832) 

this is very dangerous bug, but it looks like it didn't cause any harm.
This commit is contained in:
WuYunlong 2020-09-23 14:09:48 +08:00 committed by GitHub
parent b96c3595af
commit 63cd4d4e20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ziplist.c
View File

@ -390,7 +390,7 @@ unsigned int zipStoreEntryEncoding(unsigned char *p, unsigned char encoding, uns
(lensize) = 1; \ (lensize) = 1; \
(len) = zipIntSize(encoding); \ (len) = zipIntSize(encoding); \
} \ } \
} while(0); } while(0)
/* Encode the length of the previous entry and write it to "p". This only /* Encode the length of the previous entry and write it to "p". This only
* uses the larger encoding (required in __ziplistCascadeUpdate). */ * uses the larger encoding (required in __ziplistCascadeUpdate). */
@ -426,7 +426,7 @@ unsigned int zipStorePrevEntryLength(unsigned char *p, unsigned int len) {
} else { \ } else { \
(prevlensize) = 5; \ (prevlensize) = 5; \
} \ } \
} while(0); } while(0)
/* Return the length of the previous element, and the number of bytes that /* Return the length of the previous element, and the number of bytes that
* are used in order to encode the previous element length. * are used in order to encode the previous element length.
@ -444,7 +444,7 @@ unsigned int zipStorePrevEntryLength(unsigned char *p, unsigned int len) {
memcpy(&(prevlen), ((char*)(ptr)) + 1, 4); \ memcpy(&(prevlen), ((char*)(ptr)) + 1, 4); \
memrev32ifbe(&prevlen); \ memrev32ifbe(&prevlen); \
} \ } \
} while(0); } while(0)
/* Given a pointer 'p' to the prevlen info that prefixes an entry, this /* Given a pointer 'p' to the prevlen info that prefixes an entry, this
* function returns the difference in number of bytes needed to encode * function returns the difference in number of bytes needed to encode