Manual indent of INDENT-OFF
diff --git a/cmdline.c b/cmdline.c
index 3a115d7..114d839 100644
--- a/cmdline.c
+++ b/cmdline.c
@@ -161,7 +161,9 @@
.doneFileIndex = 0,
.exeFd = -1,
.clearEnv = false,
- .envs = {[0 ... (ARRAYSIZE(hfuzz->envs) - 1)] = NULL,},
+ .envs = {
+ [0 ... (ARRAYSIZE(hfuzz->envs) - 1)] = NULL,
+ },
.state = _HF_STATE_UNSET,
.bbMapSz = _HF_PERF_BITMAP_SIZE,
@@ -178,19 +180,19 @@
.dynFileMethod = _HF_DYNFILE_NONE,
.sanCovCnts = {
- .hitBBCnt = 0ULL,
- .totalBBCnt = 0ULL,
- .dsoCnt = 0ULL,
- .iDsoCnt = 0ULL,
- .newBBCnt = 0ULL,
- .crashesCnt = 0ULL,
- },
+ .hitBBCnt = 0ULL,
+ .totalBBCnt = 0ULL,
+ .dsoCnt = 0ULL,
+ .iDsoCnt = 0ULL,
+ .newBBCnt = 0ULL,
+ .crashesCnt = 0ULL,
+ },
.sanCov_mutex = PTHREAD_MUTEX_INITIALIZER,
.sanOpts = {
- .asanOpts = NULL,
- .msanOpts = NULL,
- .ubsanOpts = NULL,
+ .asanOpts = NULL,
+ .msanOpts = NULL,
+ .ubsanOpts = NULL,
},
.useSanCov = false,
.covMetadata = NULL,
@@ -198,21 +200,21 @@
/* Linux code */
.linux = {
- .hwCnts = {
- .cpuInstrCnt = 0ULL,
- .cpuBranchCnt = 0ULL,
- .customCnt = 0ULL,
- .bbCnt = 0ULL,
- .newBBCnt = 0ULL,
- },
- .dynamicCutOffAddr = ~(0ULL),
- .disableRandomization = true,
- .ignoreAddr = NULL,
- .numMajorFrames = 7,
- .pid = 0,
- .pidFile = NULL,
- .pidCmd = NULL,
- },
+ .hwCnts = {
+ .cpuInstrCnt = 0ULL,
+ .cpuBranchCnt = 0ULL,
+ .customCnt = 0ULL,
+ .bbCnt = 0ULL,
+ .newBBCnt = 0ULL,
+ },
+ .dynamicCutOffAddr = ~(0ULL),
+ .disableRandomization = true,
+ .ignoreAddr = NULL,
+ .numMajorFrames = 7,
+ .pid = 0,
+ .pidFile = NULL,
+ .pidCmd = NULL,
+ },
};
/* *INDENT-ON* */
diff --git a/linux/perf.c b/linux/perf.c
index fad9b8a..b62db3e 100644
--- a/linux/perf.c
+++ b/linux/perf.c
@@ -52,9 +52,6 @@
static int32_t perfIntelPtPerfType = -1;
static int32_t perfIntelBtsPerfType = -1;
-__thread size_t perfBloomSz = 0U;
-__thread uint8_t *perfBloom = NULL;
-
static inline void arch_perfBtsCount(honggfuzz_t * hfuzz, fuzzer_t * fuzzer)
{
struct perf_event_mmap_page *pem = (struct perf_event_mmap_page *)fuzzer->linux.perfMmapBuf;
@@ -237,9 +234,6 @@
return true;
}
- perfBloom = hfuzz->bbMap;
- perfBloomSz = hfuzz->bbMapSz;
-
perfFds->cpuInstrFd = -1;
perfFds->cpuBranchFd = -1;
perfFds->cpuIptBtsFd = -1;
diff --git a/sancov.c b/sancov.c
index 800cf1b..778a91a 100644
--- a/sancov.c
+++ b/sancov.c
@@ -387,8 +387,7 @@
LOG_E("Invalid map file '%s'", covFile);
return false;
}
- DEFER(free(pLine);
- pLine = NULL);
+ DEFER(free(pLine); pLine = NULL);
int pcLen = atoi(pLine);
if (pcLen == 32) {
@@ -481,7 +480,8 @@
LOG_E("Couldn't open and map '%s' in R/O mode", covFile);
return false;
}
- DEFER(munmap(dataBuf, dataFileSz); close(dataFd));
+ DEFER(munmap(dataBuf, dataFileSz);
+ close(dataFd));
/*
* Avoid cost of size checks inside raw data read loop by defining the read function
@@ -642,7 +642,8 @@
LOG_E("Couldn't open and map '%s' in R/O mode", covFile);
return false;
}
- DEFER(munmap(dataBuf, dataFileSz); close(dataFd));
+ DEFER(munmap(dataBuf, dataFileSz);
+ close(dataFd));
if (dataFileSz < 8) {
LOG_E("Coverage data file too short");