# HG changeset patch # User François Perrad # Date 1520046405 -3600 # Node ID e75dab5bec7154a85af958bde27032112f6e605b # Parent 56ec2214144f1084c1bb83928a86ab7b00d4d77e some linting after fuzz merge (#60) * fix prototype * remove extra comma * use m_free after m_strdup diff -r 56ec2214144f -r e75dab5bec71 dbhelpers.c --- a/dbhelpers.c Fri Mar 02 00:11:27 2018 +0800 +++ b/dbhelpers.c Sat Mar 03 04:06:45 2018 +0100 @@ -9,8 +9,9 @@ #elif defined(HAVE_EXPLICIT_BZERO) explicit_bzero(data, len); #else + /* This must be volatile to avoid compiler optimisation */ volatile void *p = data; - memset((void*)p, 0x0, len); + memset((void*)p, 0x0, len); #endif } diff -r 56ec2214144f -r e75dab5bec71 dbutil.c --- a/dbutil.c Fri Mar 02 00:11:27 2018 +0800 +++ b/dbutil.c Sat Mar 03 04:06:45 2018 +0100 @@ -687,6 +687,6 @@ TRACE(("error opening directory %s for fsync: %s", dir, strerror(errno))) } - free(fn_dir); + m_free(fn_dir); #endif } diff -r 56ec2214144f -r e75dab5bec71 fuzz-wrapfd.c --- a/fuzz-wrapfd.c Fri Mar 02 00:11:27 2018 +0800 +++ b/fuzz-wrapfd.c Sat Mar 03 04:06:45 2018 +0100 @@ -26,7 +26,7 @@ static unsigned int nused; static unsigned short rand_state[3]; -void wrapfd_setup() { +void wrapfd_setup(void) { TRACE(("wrapfd_setup")) nused = 0; memset(wrap_fds, 0x0, sizeof(wrap_fds)); diff -r 56ec2214144f -r e75dab5bec71 fuzz-wrapfd.h --- a/fuzz-wrapfd.h Fri Mar 02 00:11:27 2018 +0800 +++ b/fuzz-wrapfd.h Sat Mar 03 04:06:45 2018 +0100 @@ -7,10 +7,10 @@ UNUSED = 0, PLAIN, INPROGRESS, - RANDOMIN, + RANDOMIN }; -void wrapfd_setup(); +void wrapfd_setup(void); void wrapfd_setseed(uint32_t seed); // doesn't take ownership of buf. buf is optional. void wrapfd_add(int fd, buffer *buf, enum wrapfd_mode mode);