some linting after fuzz merge (#60)

* fix prototype * remove extra comma * use m_free after m_strdup
mkj · Mar 3, 2018 · 257bba0 · 257bba0
1 parent ce1f9cd
commit 257bba0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/dbhelpers.c b/dbhelpers.c
@@ -9,8 +9,9 @@ void m_burn(void *data, unsigned int len) {
 #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 --git a/dbutil.c b/dbutil.c
@@ -687,6 +687,6 @@ void fsync_parent_dir(const char* fn) {
 		TRACE(("error opening directory %s for fsync: %s", dir, strerror(errno)))
 	}
 
-	free(fn_dir);
+	m_free(fn_dir);
 #endif
 }
diff --git a/fuzz-wrapfd.c b/fuzz-wrapfd.c
@@ -26,7 +26,7 @@ static int wrap_used[IOWRAP_MAXFD+1];
 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 --git a/fuzz-wrapfd.h b/fuzz-wrapfd.h
@@ -7,10 +7,10 @@ enum wrapfd_mode {
     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);