diff options
author | Andrea Fioraldi <andreafioraldi@gmail.com> | 2020-04-14 10:12:41 +0200 |
---|---|---|
committer | Andrea Fioraldi <andreafioraldi@gmail.com> | 2020-04-14 10:12:41 +0200 |
commit | 1d62bf1c37b9a1803745abb41ed41057959a45d2 (patch) | |
tree | 3e33e4d0535291ca5a6968c3ed5bb18f72acd20e /src/afl-tmin.c | |
parent | 982d46e7cb2c7cabcd8969e6303c3cb8f3d8e56a (diff) | |
parent | 1374e65401c9d40b449c78459a2d0241c779b989 (diff) | |
download | afl++-1d62bf1c37b9a1803745abb41ed41057959a45d2.tar.gz |
solve conflicts
Diffstat (limited to 'src/afl-tmin.c')
-rw-r--r-- | src/afl-tmin.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/afl-tmin.c b/src/afl-tmin.c index 3be6b2c0..31fad1df 100644 --- a/src/afl-tmin.c +++ b/src/afl-tmin.c @@ -60,7 +60,7 @@ static u8 *mask_bitmap; /* Mask for trace bits (-B) */ -u8 *in_file, /* Minimizer input test case */ +static u8 *in_file, /* Minimizer input test case */ *output_file; /* Minimizer output file */ static u8 *in_data; /* Input data for trimming */ @@ -72,7 +72,7 @@ static u32 in_len, /* Input data length */ missed_crashes, /* Misses due to crashes */ missed_paths; /* Misses due to exec path diffs */ -u8 crash_mode, /* Crash-centric mode? */ +static u8 crash_mode, /* Crash-centric mode? */ hang_mode, /* Minimize as long as it hangs */ exit_crash, /* Treat non-zero exit as crash? */ edges_only, /* Ignore hit counts? */ |