commit 5e26bd995c9cdd5db9b5463d7108e295220b9cec
author Robert Swiecki <robert@swiecki.net> Fri Mar 02 12:09:34 2018 +0100
committer Robert Swiecki <robert@swiecki.net> Fri Mar 02 12:09:34 2018 +0100
tree 1e928f963c2924bd79dcfa2a469efd87cdb5dfc2
parent e9231d6adc7308a20c959dc5fe5d8ca38d5b4d48

honggfuzz: move more vars to substructs

cmdline.c

diff --git a/cmdline.c b/cmdline.c
index 0a6d302..80c12bc 100644
--- a/cmdline.c
+++ b/cmdline.c
@@ -279,8 +279,17 @@
                 .mutationsPerRun = 6U,
                 .maxFileSz = 0UL,
             },
-        .cmdline_txt[0] = '\0',
-        .useScreen = true,
+        .display =
+            {
+                .useScreen = true,
+                .cmdline_txt[0] = '\0',
+            },
+        .socketFuzzer =
+            {
+                .enabled = false,
+                .serverSocket = -1,
+                .clientSocket = -1,
+            },
         .useVerifier = false,
         .blacklistFile = NULL,
         .blacklistCnt = 0,
@@ -314,8 +323,6 @@
 
         .feedback_mutex = PTHREAD_MUTEX_INITIALIZER,
 
-        .socketFuzzer = false,
-
         .cnts =
             {
                 .mutationsCnt = 0,
@@ -476,7 +483,7 @@
                 hfuzz->exe.nullifyStdio = false;
                 break;
             case 'v':
-                hfuzz->useScreen = false;
+                hfuzz->display.useScreen = false;
                 break;
             case 'V':
                 hfuzz->useVerifier = true;
@@ -527,7 +534,7 @@
                 hfuzz->extSanOpts = optarg;
                 break;
             case 0x10B:
-                hfuzz->socketFuzzer = true;
+                hfuzz->socketFuzzer.enabled = true;
                 hfuzz->timing.tmOut = 0;  // Disable process timeout checks
                 break;
             case 'z':
@@ -692,7 +699,7 @@
         "fileExtn: '%s', "
         "ASLimit: 0x%" PRIx64 "(MiB), RSSLimit: 0x%" PRIx64 ", DATALimit: 0x%" PRIx64
         ", fuzzExe: '%s', fuzzedPid: %d, monitorSIGABRT: '%s'",
-        hfuzz->cmdline_txt, (int)getpid(), hfuzz->io.inputDir,
+        hfuzz->display.cmdline_txt, (int)getpid(), hfuzz->io.inputDir,
         cmdlineYesNo(hfuzz->exe.nullifyStdio), cmdlineYesNo(hfuzz->exe.fuzzStdin),
         cmdlineYesNo(hfuzz->io.saveUnique), hfuzz->mutate.mutationsPerRun,
         hfuzz->exe.externalCommand == NULL ? "NULL" : hfuzz->exe.externalCommand,