diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/afl-analyze.c | 2 | ||||
-rw-r--r-- | src/afl-as.c | 6 | ||||
-rw-r--r-- | src/afl-common.c | 2 | ||||
-rw-r--r-- | src/afl-fuzz-init.c | 16 | ||||
-rw-r--r-- | src/afl-fuzz-one.c | 6 | ||||
-rw-r--r-- | src/afl-fuzz.c | 18 | ||||
-rw-r--r-- | src/afl-gotcpu.c | 6 | ||||
-rw-r--r-- | src/afl-sharedmem.c | 6 | ||||
-rw-r--r-- | src/afl-showmap.c | 2 | ||||
-rw-r--r-- | src/afl-tmin.c | 2 |
10 files changed, 33 insertions, 33 deletions
diff --git a/src/afl-analyze.c b/src/afl-analyze.c index e3014256..4cfebe3b 100644 --- a/src/afl-analyze.c +++ b/src/afl-analyze.c @@ -22,7 +22,7 @@ #define AFL_MAIN #ifdef __ANDROID__ -# include "android-ashmem.h" +#include "android-ashmem.h" #endif #include "config.h" #include "types.h" diff --git a/src/afl-as.c b/src/afl-as.c index 57f4c4a3..96b00d37 100644 --- a/src/afl-as.c +++ b/src/afl-as.c @@ -74,9 +74,9 @@ static u8 use_64bit = 1; static u8 use_64bit = 0; -# ifdef __APPLE__ -# error "Sorry, 32-bit Apple platforms are not supported." -# endif /* __APPLE__ */ +#ifdef __APPLE__ +#error "Sorry, 32-bit Apple platforms are not supported." +#endif /* __APPLE__ */ #endif /* ^__x86_64__ */ diff --git a/src/afl-common.c b/src/afl-common.c index 9f1f45eb..69c1a77d 100644 --- a/src/afl-common.c +++ b/src/afl-common.c @@ -13,7 +13,7 @@ /* Detect @@ in args. */ #ifndef __glibc__ -# include <unistd.h> +#include <unistd.h> #endif void detect_file_args(char** argv, u8* prog_in) { diff --git a/src/afl-fuzz-init.c b/src/afl-fuzz-init.c index 8a3ee6fa..8588dde7 100644 --- a/src/afl-fuzz-init.c +++ b/src/afl-fuzz-init.c @@ -1491,25 +1491,25 @@ void get_core_count(void) { /* On *BSD systems, we can just use a sysctl to get the number of CPUs. */ -# ifdef __APPLE__ +#ifdef __APPLE__ if (sysctlbyname("hw.logicalcpu", &cpu_core_count, &s, NULL, 0) < 0) return; -# else +#else int s_name[2] = {CTL_HW, HW_NCPU}; if (sysctl(s_name, 2, &cpu_core_count, &s, NULL, 0) < 0) return; -# endif /* ^__APPLE__ */ +#endif /* ^__APPLE__ */ #else -# ifdef HAVE_AFFINITY +#ifdef HAVE_AFFINITY cpu_core_count = sysconf(_SC_NPROCESSORS_ONLN); -# else +#else FILE* f = fopen("/proc/stat", "r"); u8 tmp[1024]; @@ -1521,7 +1521,7 @@ void get_core_count(void) { fclose(f); -# endif /* ^HAVE_AFFINITY */ +#endif /* ^HAVE_AFFINITY */ #endif /* ^(__APPLE__ || __FreeBSD__ || __OpenBSD__) */ @@ -1772,10 +1772,10 @@ void check_binary(u8* fname) { #else -# if !defined(__arm__) && !defined(__arm64__) +#if !defined(__arm__) && !defined(__arm64__) if (f_data[0] != 0xCF || f_data[1] != 0xFA || f_data[2] != 0xED) FATAL("Program '%s' is not a 64-bit Mach-O binary", target_path); -# endif +#endif #endif /* ^!__APPLE__ */ diff --git a/src/afl-fuzz-one.c b/src/afl-fuzz-one.c index 1b7abedd..bc63c226 100644 --- a/src/afl-fuzz-one.c +++ b/src/afl-fuzz-one.c @@ -2242,11 +2242,11 @@ retry_splicing: out_buf = ck_alloc_nozero(len); memcpy(out_buf, in_buf, len); -# ifdef USE_PYTHON +#ifdef USE_PYTHON goto python_stage; -# else +#else goto havoc_stage; -# endif +#endif } diff --git a/src/afl-fuzz.c b/src/afl-fuzz.c index 685840c6..d04058ca 100644 --- a/src/afl-fuzz.c +++ b/src/afl-fuzz.c @@ -27,10 +27,10 @@ static void usage(u8* argv0) { #ifdef USE_PYTHON -# define PHYTON_SUPPORT\ +#define PHYTON_SUPPORT \ "Compiled with Python 2.7 module support, see docs/python_mutators.txt\n" #else -# define PHYTON_SUPPORT "" +#define PHYTON_SUPPORT "" #endif SAYF( @@ -616,9 +616,9 @@ int main(int argc, char** argv) { get_core_count(); -# ifdef HAVE_AFFINITY +#ifdef HAVE_AFFINITY bind_to_free_cpu(); -# endif /* HAVE_AFFINITY */ +#endif /* HAVE_AFFINITY */ check_crash_handling(); check_cpu_governor(); @@ -635,12 +635,12 @@ int main(int argc, char** argv) { setup_dirs_fds(); -# ifdef USE_PYTHON +#ifdef USE_PYTHON if (init_py()) FATAL("Failed to initialize Python module"); -# else +#else if (getenv("AFL_PYTHON_MODULE")) FATAL("Your AFL binary was built without Python support"); -# endif +#endif setup_cmdline_file(argv + optind); @@ -867,9 +867,9 @@ stop_fuzzing: alloc_report(); -# ifdef USE_PYTHON +#ifdef USE_PYTHON finalize_py(); -# endif +#endif OKF("We're done here. Have a nice day!\n"); diff --git a/src/afl-gotcpu.c b/src/afl-gotcpu.c index 5aa9b35c..fd96d25d 100644 --- a/src/afl-gotcpu.c +++ b/src/afl-gotcpu.c @@ -27,11 +27,11 @@ #define AFL_MAIN #ifndef _GNU_SOURCE -# define _GNU_SOURCE +#define _GNU_SOURCE #endif #ifdef __ANDROID__ -# include "android-ashmem.h" +#include "android-ashmem.h" #endif #include <stdio.h> #include <stdlib.h> @@ -48,7 +48,7 @@ #include "debug.h" #ifdef __linux__ -# define HAVE_AFFINITY 1 +#define HAVE_AFFINITY 1 #endif /* __linux__ */ /* Get unix time in microseconds. */ diff --git a/src/afl-sharedmem.c b/src/afl-sharedmem.c index 9c7ac7c3..60764779 100644 --- a/src/afl-sharedmem.c +++ b/src/afl-sharedmem.c @@ -5,7 +5,7 @@ #define AFL_MAIN #ifdef __ANDROID__ -# include "android-ashmem.h" +#include "android-ashmem.h" #endif #include "config.h" #include "types.h" @@ -32,8 +32,8 @@ #include <sys/mman.h> #ifndef USEMMAP -# include <sys/ipc.h> -# include <sys/shm.h> +#include <sys/ipc.h> +#include <sys/shm.h> #endif extern unsigned char *trace_bits; diff --git a/src/afl-showmap.c b/src/afl-showmap.c index ac3d687d..5c367339 100644 --- a/src/afl-showmap.c +++ b/src/afl-showmap.c @@ -24,7 +24,7 @@ #define AFL_MAIN #ifdef __ANDROID__ -# include "android-ashmem.h" +#include "android-ashmem.h" #endif #include "config.h" #include "types.h" diff --git a/src/afl-tmin.c b/src/afl-tmin.c index 9decdb4d..ce4a3d76 100644 --- a/src/afl-tmin.c +++ b/src/afl-tmin.c @@ -22,7 +22,7 @@ #define AFL_MAIN #ifdef __ANDROID__ -# include "android-ashmem.h" +#include "android-ashmem.h" #endif #include "config.h" |