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

Cleanup ziplist valgrind warnings

Browse Source 
Valgrind can't detect 'memset' initializes things, so let's
statically initialize them to remove some unnecessary warnings.
This commit is contained in:
Matt Stancliff 2014-11-13 16:21:27 -05:00
parent 1dfcd75ae3
commit 9b786b124d
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/ziplist.c
View File

@ -162,6 +162,13 @@ typedef struct zlentry {
unsigned char *p; unsigned char *p;
} zlentry; } zlentry;
#define ZIPLIST_ENTRY_ZERO(zle) { \
(zle)->prevrawlensize = (zle)->prevrawlen = 0; \
(zle)->lensize = (zle)->len = (zle)->headersize = 0; \
(zle)->encoding = 0; \
(zle)->p = NULL; \
}
/* Extract the encoding from the byte pointed by 'ptr' and set it into /* Extract the encoding from the byte pointed by 'ptr' and set it into
* 'encoding'. */ * 'encoding'. */
#define ZIP_ENTRY_ENCODING(ptr, encoding) do { \ #define ZIP_ENTRY_ENCODING(ptr, encoding) do { \
@ -1068,11 +1075,12 @@ static int randstring(char *target, unsigned int min, unsigned int max) {
} }
static void verify(unsigned char *zl, zlentry *e) { static void verify(unsigned char *zl, zlentry *e) {
int i;
int len = ziplistLen(zl); int len = ziplistLen(zl);
zlentry _e; zlentry _e;
for (i = 0; i < len; i++) { ZIPLIST_ENTRY_ZERO(&_e);
for (int i = 0; i < len; i++) {
memset(&e[i], 0, sizeof(zlentry)); memset(&e[i], 0, sizeof(zlentry));
zipEntry(ziplistIndex(zl, i), &e[i]); zipEntry(ziplistIndex(zl, i), &e[i]);
@ -1347,7 +1355,7 @@ int ziplistTest(int argc, char **argv) {
printf("Regression test for >255 byte strings:\n"); printf("Regression test for >255 byte strings:\n");
{ {
char v1[257],v2[257]; char v1[257] = {0}, v2[257] = {0};
memset(v1,'x',256); memset(v1,'x',256);
memset(v2,'y',256); memset(v2,'y',256);
zl = ziplistNew(); zl = ziplistNew();
@ -1366,8 +1374,9 @@ int ziplistTest(int argc, char **argv) {
printf("Regression test deleting next to last entries:\n"); printf("Regression test deleting next to last entries:\n");
{ {
char v[3][257]; char v[3][257] = {{0}};
zlentry e[3]; zlentry e[3] = {{.prevrawlensize = 0, .prevrawlen = 0, .lensize = 0,
.len = 0, .headersize = 0, .encoding = 0, .p = NULL}};
size_t i; size_t i;
for (i = 0; i < (sizeof(v)/sizeof(v[0])); i++) { for (i = 0; i < (sizeof(v)/sizeof(v[0])); i++) {