From d3fc73612360e0c8818c3f4d43f4862c5767f579 Mon Sep 17 00:00:00 2001 From: WuYunlong Date: Wed, 23 Sep 2020 14:09:48 +0800 Subject: [PATCH] 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. (cherry picked from commit 00668f782f0d8e987fc2c049c34e100567c0a5c6) --- src/ziplist.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ziplist.c b/src/ziplist.c index e27875f6e..8721ace39 100644 --- a/src/ziplist.c +++ b/src/ziplist.c @@ -390,7 +390,7 @@ unsigned int zipStoreEntryEncoding(unsigned char *p, unsigned char encoding, uns (lensize) = 1; \ (len) = zipIntSize(encoding); \ } \ -} while(0); +} while(0) /* Encode the length of the previous entry and write it to "p". This only * uses the larger encoding (required in __ziplistCascadeUpdate). */ @@ -426,7 +426,7 @@ unsigned int zipStorePrevEntryLength(unsigned char *p, unsigned int len) { } else { \ (prevlensize) = 5; \ } \ -} while(0); +} while(0) /* Return the length of the previous element, and the number of bytes that * 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); \ memrev32ifbe(&prevlen); \ } \ -} while(0); +} while(0) /* Given a pointer 'p' to the prevlen info that prefixes an entry, this * function returns the difference in number of bytes needed to encode