commit e9231d6adc7308a20c959dc5fe5d8ca38d5b4d48
author Robert Swiecki <robert@swiecki.net> Fri Mar 02 03:35:11 2018 +0100
committer Robert Swiecki <robert@swiecki.net> Fri Mar 02 03:35:11 2018 +0100
tree dcb708e5664df60abbee1d9563d898357d943364
parent fe6f15cc14e1efcb54334a95ecfdbd7d6296a023

honggfuzz: move more vars to substructs

input.c

diff --git a/input.c b/input.c
index fcad6f8..f4589e9 100644
--- a/input.c
+++ b/input.c
@@ -53,8 +53,8 @@
 #include "libhfcommon/util.h"
 
 void input_setSize(run_t* run, size_t sz) {
-    if (sz > run->global->maxFileSz) {
-        PLOG_F("Too large size requested: %zu > maxSize: %zu", sz, run->global->maxFileSz);
+    if (sz > run->global->mutate.maxFileSz) {
+        PLOG_F("Too large size requested: %zu > maxSize: %zu", sz, run->global->mutate.maxFileSz);
     }
     run->dynamicFileSz = sz;
 }
@@ -91,9 +91,9 @@
             LOG_D("'%s' is not a regular file, skipping", fname);
             continue;
         }
-        if (hfuzz->maxFileSz != 0UL && st.st_size > (off_t)hfuzz->maxFileSz) {
+        if (hfuzz->mutate.maxFileSz != 0UL && st.st_size > (off_t)hfuzz->mutate.maxFileSz) {
             LOG_D("File '%s' is bigger than maximal defined file size (-F): %" PRId64 " > %" PRId64,
-                fname, (int64_t)st.st_size, (int64_t)hfuzz->maxFileSz);
+                fname, (int64_t)st.st_size, (int64_t)hfuzz->mutate.maxFileSz);
         }
         if ((size_t)st.st_size > maxSize) {
             maxSize = st.st_size;
@@ -102,13 +102,13 @@
     }
 
     ATOMIC_SET(hfuzz->io.fileCnt, fileCnt);
-    if (hfuzz->maxFileSz == 0U) {
+    if (hfuzz->mutate.maxFileSz == 0U) {
         if (maxSize < 8192) {
-            hfuzz->maxFileSz = 8192;
+            hfuzz->mutate.maxFileSz = 8192;
         } else if (maxSize > _HF_INPUT_MAX_SIZE) {
-            hfuzz->maxFileSz = _HF_INPUT_MAX_SIZE;
+            hfuzz->mutate.maxFileSz = _HF_INPUT_MAX_SIZE;
         } else {
-            hfuzz->maxFileSz = maxSize;
+            hfuzz->mutate.maxFileSz = maxSize;
         }
     }
 
@@ -117,7 +117,7 @@
     }
 
     LOG_D("Re-read the '%s', maxFileSz:%zu, number of usable files:%zu", hfuzz->io.inputDir,
-        hfuzz->maxFileSz, hfuzz->io.fileCnt);
+        hfuzz->mutate.maxFileSz, hfuzz->io.fileCnt);
 
     rewinddir(hfuzz->io.inputDirPtr);
 
@@ -336,7 +336,7 @@
     }
     snprintf(run->origFileName, sizeof(run->origFileName), "%s", fname);
 
-    ssize_t fileSz = files_readFileToBufMax(fname, run->dynamicFile, run->global->maxFileSz);
+    ssize_t fileSz = files_readFileToBufMax(fname, run->dynamicFile, run->global->mutate.maxFileSz);
     if (fileSz < 0) {
         LOG_E("Couldn't read contents of '%s'", fname);
         return false;
@@ -370,7 +370,7 @@
     }
     LOG_D("Subporcess '%s' finished with success", run->global->exe.externalCommand);
 
-    ssize_t sz = files_readFromFdSeek(fd, run->dynamicFile, run->global->maxFileSz, 0);
+    ssize_t sz = files_readFromFdSeek(fd, run->dynamicFile, run->global->mutate.maxFileSz, 0);
     if (sz == -1) {
         LOG_E("Couldn't read file from fd=%d", fd);
         return false;
@@ -401,7 +401,7 @@
     }
     LOG_D("Subporcess '%s' finished with success", run->global->exe.externalCommand);
 
-    ssize_t sz = files_readFromFdSeek(fd, run->dynamicFile, run->global->maxFileSz, 0);
+    ssize_t sz = files_readFromFdSeek(fd, run->dynamicFile, run->global->mutate.maxFileSz, 0);
     if (sz == -1) {
         LOG_E("Couldn't read file from fd=%d", fd);
         return false;