fix typo in custom format

11 files changed, 76 insertions, 71 deletions

diff --git a/include/afl-as.h b/include/afl-as.h
index f7e5c4dd..048866db 100644
--- a/include/afl-as.h
+++ b/include/afl-as.h
@@ -3,7 +3,7 @@
    ---------------------------------------
 
    Originally written by Michal Zalewski <lcamtuf@google.com>
-   
+
    Now maintained by by Marc Heuse <mh@mh-sec.de>,
                         Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
                         Andrea Fioraldi <andreafioraldi@gmail.com>
@@ -186,14 +186,14 @@ static const u8* main_payload_32 =
   "  movl %ecx, __afl_prev_loc\n"
 #else
   "  movl %ecx, %edi\n"
-#endif /* ^!COVERAGE_ONLY */
+#endif                                                   /* ^!COVERAGE_ONLY */
   "\n"
 #ifdef SKIP_COUNTS
   "  orb  $1, (%edx, %edi, 1)\n"
 #else
   "  incb (%edx, %edi, 1)\n"
   "  adcb $0, (%edx, %edi, 1)\n" // never zero counter implementation. slightly better path discovery and little performance impact
-#endif /* ^SKIP_COUNTS */
+#endif                                                      /* ^SKIP_COUNTS */
   "\n"
   "__afl_return:\n"
   "\n"
@@ -382,7 +382,7 @@ static const u8* main_payload_32 =
   "  .comm   __afl_setup_failure, 1, 32\n"
 #ifndef COVERAGE_ONLY
   "  .comm   __afl_prev_loc, 4, 32\n"
-#endif /* !COVERAGE_ONLY */
+#endif                                                    /* !COVERAGE_ONLY */
   "  .comm   __afl_fork_pid, 4, 32\n"
   "  .comm   __afl_temp, 4, 32\n"
   "\n"
@@ -404,7 +404,7 @@ static const u8* main_payload_32 =
 #define CALL_L64(str) "call _" str "\n"
 #else
 #define CALL_L64(str) "call " str "@PLT\n"
-#endif /* ^__APPLE__ */
+#endif                                                        /* ^__APPLE__ */
 
 static const u8* main_payload_64 = 
 
@@ -422,7 +422,7 @@ static const u8* main_payload_64 =
   "  .byte 0x9f /* lahf */\n"
 #else
   "  lahf\n"
-#endif /* ^__OpenBSD__, etc */
+#endif                                                 /* ^__OpenBSD__, etc */
   "  seto  %al\n"
   "\n"
   "  /* Check if SHM region is already mapped. */\n"
@@ -439,14 +439,14 @@ static const u8* main_payload_64 =
   "  xorq __afl_prev_loc(%rip), %rcx\n"
   "  xorq %rcx, __afl_prev_loc(%rip)\n"
   "  shrq $1, __afl_prev_loc(%rip)\n"
-#endif /* ^!COVERAGE_ONLY */
+#endif                                                   /* ^!COVERAGE_ONLY */
   "\n"
 #ifdef SKIP_COUNTS
   "  orb  $1, (%rdx, %rcx, 1)\n"
 #else
   "  incb (%rdx, %rcx, 1)\n"
   "  adcb $0, (%rdx, %rcx, 1)\n" // never zero counter implementation. slightly better path discovery and little performance impact
-#endif /* ^SKIP_COUNTS */
+#endif                                                      /* ^SKIP_COUNTS */
   "\n"
   "__afl_return:\n"
   "\n"
@@ -455,7 +455,7 @@ static const u8* main_payload_64 =
   "  .byte 0x9e /* sahf */\n"
 #else
   "  sahf\n"
-#endif /* ^__OpenBSD__, etc */
+#endif                                                 /* ^__OpenBSD__, etc */
   "  ret\n"
   "\n"
   ".align 8\n"
@@ -474,7 +474,7 @@ static const u8* main_payload_64 =
   "  movq  (%rdx), %rdx\n"
 #else
   "  movq  __afl_global_area_ptr(%rip), %rdx\n"
-#endif /* !^__APPLE__ */
+#endif                                                       /* !^__APPLE__ */
   "  testq %rdx, %rdx\n"
   "  je    __afl_setup_first\n"
   "\n"
@@ -573,7 +573,7 @@ static const u8* main_payload_64 =
 #else
   "  movq __afl_global_area_ptr@GOTPCREL(%rip), %rdx\n"
   "  movq %rax, (%rdx)\n"
-#endif /* ^__APPLE__ */
+#endif                                                        /* ^__APPLE__ */
   "  movq %rax, %rdx\n"
   "\n"
   "__afl_forkserver:\n"
@@ -742,7 +742,7 @@ static const u8* main_payload_64 =
   "  .comm   __afl_area_ptr, 8\n"
 #ifndef COVERAGE_ONLY
   "  .comm   __afl_prev_loc, 8\n"
-#endif /* !COVERAGE_ONLY */
+#endif                                                    /* !COVERAGE_ONLY */
   "  .comm   __afl_fork_pid, 4\n"
   "  .comm   __afl_temp, 4\n"
   "  .comm   __afl_setup_failure, 1\n"
@@ -752,12 +752,12 @@ static const u8* main_payload_64 =
   "  .lcomm   __afl_area_ptr, 8\n"
 #ifndef COVERAGE_ONLY
   "  .lcomm   __afl_prev_loc, 8\n"
-#endif /* !COVERAGE_ONLY */
+#endif                                                    /* !COVERAGE_ONLY */
   "  .lcomm   __afl_fork_pid, 4\n"
   "  .lcomm   __afl_temp, 4\n"
   "  .lcomm   __afl_setup_failure, 1\n"
 
-#endif /* ^__APPLE__ */
+#endif                                                        /* ^__APPLE__ */
 
   "  .comm    __afl_global_area_ptr, 8, 8\n"
   "\n"
@@ -767,5 +767,5 @@ static const u8* main_payload_64 =
   "/* --- END --- */\n"
   "\n";
 
-#endif /* !_HAVE_AFL_AS_H */
+#endif                                                   /* !_HAVE_AFL_AS_H */
 
diff --git a/include/afl-fuzz.h b/include/afl-fuzz.h
index 17bdf95d..571ca879 100644
--- a/include/afl-fuzz.h
+++ b/include/afl-fuzz.h
@@ -3,7 +3,7 @@
    ------------------------------------
 
    Originally written by Michal Zalewski <lcamtuf@google.com>
-   
+
    Now maintained by by Marc Heuse <mh@mh-sec.de>,
                         Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
                         Andrea Fioraldi <andreafioraldi@gmail.com>
@@ -74,20 +74,20 @@
 #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)
 #include <sys/sysctl.h>
 #define HAVE_ARC4RANDOM 1
-#endif /* __APPLE__ || __FreeBSD__ || __OpenBSD__ */
+#endif                           /* __APPLE__ || __FreeBSD__ || __OpenBSD__ */
 
 /* For systems that have sched_setaffinity; right now just Linux, but one
    can hope... */
 
 #ifdef __linux__
 #define HAVE_AFFINITY 1
-#endif /* __linux__ */
+#endif                                                         /* __linux__ */
 
 #ifndef SIMPLE_FILES
 #define CASE_PREFIX "id:"
 #else
 #define CASE_PREFIX "id_"
-#endif /* ^!SIMPLE_FILES */
+#endif                                                    /* ^!SIMPLE_FILES */
 
 struct queue_entry {
 
@@ -400,7 +400,7 @@ extern s32 cpu_core_count;              /* CPU core count                   */
 
 extern s32 cpu_aff;                     /* Selected CPU core                */
 
-#endif /* HAVE_AFFINITY */
+#endif                                                     /* HAVE_AFFINITY */
 
 extern FILE* plot_file;                 /* Gnuplot output file              */
 
diff --git a/include/alloc-inl.h b/include/alloc-inl.h
index de9ac1fc..d851fd61 100644
--- a/include/alloc-inl.h
+++ b/include/alloc-inl.h
@@ -3,7 +3,7 @@
    --------------------------------------------------------------------
 
    Originally written by Michal Zalewski <lcamtuf@google.com>
-   
+
    Now maintained by by Marc Heuse <mh@mh-sec.de>,
                         Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
                         Andrea Fioraldi <andreafioraldi@gmail.com>
@@ -69,9 +69,9 @@
 
 /* Magic tokens used to mark used / freed chunks. */
 
-#define ALLOC_MAGIC_C1 0xFF00FF00 /* Used head (dword)  */
-#define ALLOC_MAGIC_F 0xFE00FE00  /* Freed head (dword) */
-#define ALLOC_MAGIC_C2 0xF0       /* Used tail (byte)   */
+#define ALLOC_MAGIC_C1 0xFF00FF00                     /* Used head (dword)  */
+#define ALLOC_MAGIC_F 0xFE00FE00                      /* Freed head (dword) */
+#define ALLOC_MAGIC_C2 0xF0                           /* Used tail (byte)   */
 
 /* Positions of guard tokens in relation to the user-visible pointer. */
 
@@ -111,14 +111,17 @@
                            \
                            \
                            \
+                           \
     if (_p) { \
               \
               \
               \
+              \
       if (ALLOC_C1(_p) ^ ALLOC_MAGIC_C1) {\
                                           \
                                           \
                                           \
+                                          \
         if (ALLOC_C1(_p) == ALLOC_MAGIC_F) \
           ABORT("Use after free."); \
         else ABORT("Corrupted head alloc canary."); \
@@ -126,6 +129,7 @@
       } \
         \
         \
+        \
       if (ALLOC_C2(_p) ^ ALLOC_MAGIC_C2) \
         ABORT("Corrupted tail alloc canary."); \
                                                \
@@ -134,6 +138,7 @@
       \
       \
       \
+      \
   } while (0)
 
 */
@@ -197,7 +202,7 @@ static inline void DFL_ck_free(void* mem) {
   /* Catch pointer issues sooner. */
   memset(mem, 0xFF, ALLOC_S(mem));
 
-#endif /* DEBUG_BUILD */
+#endif                                                       /* DEBUG_BUILD */
 
   ALLOC_C1(mem) = ALLOC_MAGIC_F;
 
@@ -228,7 +233,7 @@ static inline void* DFL_ck_realloc(void* orig, u32 size) {
 
 #ifndef DEBUG_BUILD
     ALLOC_C1(orig) = ALLOC_MAGIC_F;
-#endif /* !DEBUG_BUILD */
+#endif                                                      /* !DEBUG_BUILD */
 
     old_size = ALLOC_S(orig);
     u8* origu8 = orig;
@@ -266,7 +271,7 @@ static inline void* DFL_ck_realloc(void* orig, u32 size) {
 
   }
 
-#endif /* ^!DEBUG_BUILD */
+#endif                                                     /* ^!DEBUG_BUILD */
 
   ret += ALLOC_OFF_HEAD;
 
@@ -297,7 +302,7 @@ static inline void* DFL_ck_realloc_block(void* orig, u32 size) {
 
   }
 
-#endif /* !DEBUG_BUILD */
+#endif                                                      /* !DEBUG_BUILD */
 
   return DFL_ck_realloc(orig, size);
 
@@ -424,7 +429,7 @@ extern u32             TRK_cnt[ALLOC_BUCKETS];
 
 #define alloc_report()
 
-#endif /* ^AFL_MAIN */
+#endif                                                         /* ^AFL_MAIN */
 
 /* Bucket-assigning function for a given pointer: */
 
@@ -600,7 +605,7 @@ static inline void TRK_ck_free(void* ptr, const char* file, const char* func,
 
 #define ck_free(_p1) TRK_ck_free(_p1, __FILE__, __FUNCTION__, __LINE__)
 
-#endif /* ^!DEBUG_BUILD */
+#endif                                                     /* ^!DEBUG_BUILD */
 
-#endif /* ! _HAVE_ALLOC_INL_H */
+#endif                                               /* ! _HAVE_ALLOC_INL_H */
 
diff --git a/include/android-ashmem.h b/include/android-ashmem.h
index bfe7166e..6c7a98db 100644
--- a/include/android-ashmem.h
+++ b/include/android-ashmem.h
@@ -3,7 +3,7 @@
    ----------------------------------------------------------------
 
    Originally written by Michal Zalewski <lcamtuf@google.com>
-   
+
    Now maintained by by Marc Heuse <mh@mh-sec.de>,
                         Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
                         Andrea Fioraldi <andreafioraldi@gmail.com>
diff --git a/include/common.h b/include/common.h
index 443d1418..905830b5 100644
--- a/include/common.h
+++ b/include/common.h
@@ -3,7 +3,7 @@
    ---------------------------------------------
 
    Originally written by Michal Zalewski <lcamtuf@google.com>
-   
+
    Now maintained by by Marc Heuse <mh@mh-sec.de>,
                         Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
                         Andrea Fioraldi <andreafioraldi@gmail.com>
diff --git a/include/config.h b/include/config.h
index 3ea75bb5..9a263c86 100644
--- a/include/config.h
+++ b/include/config.h
@@ -3,7 +3,7 @@
    ------------------------------------------------
 
    Originally written by Michal Zalewski <lcamtuf@google.com>
-   
+
    Now maintained by by Marc Heuse <mh@mh-sec.de>,
                         Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
                         Andrea Fioraldi <andreafioraldi@gmail.com>
@@ -58,7 +58,7 @@
 #define MEM_LIMIT 25
 #else
 #define MEM_LIMIT 50
-#endif /* ^!__x86_64__ */
+#endif                                                      /* ^!__x86_64__ */
 
 /* Default memory limit when running in QEMU mode (MB): */
 
@@ -128,9 +128,9 @@
 /* Probabilities of skipping non-favored entries in the queue, expressed as
    percentages: */
 
-#define SKIP_TO_NEW_PROB 99   /* ...when there are new, pending favorites */
-#define SKIP_NFAV_OLD_PROB 95 /* ...no new favs, cur entry already fuzzed */
-#define SKIP_NFAV_NEW_PROB 75 /* ...no new favs, cur entry not fuzzed yet */
+#define SKIP_TO_NEW_PROB 99     /* ...when there are new, pending favorites */
+#define SKIP_NFAV_OLD_PROB 95   /* ...no new favs, cur entry already fuzzed */
+#define SKIP_NFAV_NEW_PROB 75   /* ...no new favs, cur entry not fuzzed yet */
 
 /* Splicing cycle count: */
 
@@ -371,5 +371,5 @@
 
 // #define IGNORE_FINDS
 
-#endif /* ! _HAVE_CONFIG_H */
+#endif                                                  /* ! _HAVE_CONFIG_H */
 
diff --git a/include/debug.h b/include/debug.h
index 201ff943..cccfc284 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -3,7 +3,7 @@
    ----------------------------------------------------
 
    Originally written by Michal Zalewski <lcamtuf@google.com>
-   
+
    Now maintained by by Marc Heuse <mh@mh-sec.de>,
                         Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
                         Andrea Fioraldi <andreafioraldi@gmail.com>
@@ -105,7 +105,7 @@
 #define bgLCY ""
 #define bgBRI ""
 
-#endif /* ^USE_COLOR */
+#endif                                                        /* ^USE_COLOR */
 
 /*************************
  * Box drawing sequences *
@@ -113,21 +113,21 @@
 
 #ifdef FANCY_BOXES
 
-#define SET_G1 "\x1b)0"   /* Set G1 for box drawing    */
-#define RESET_G1 "\x1b)B" /* Reset G1 to ASCII         */
-#define bSTART "\x0e"     /* Enter G1 drawing mode     */
-#define bSTOP "\x0f"      /* Leave G1 drawing mode     */
-#define bH "q"            /* Horizontal line           */
-#define bV "x"            /* Vertical line             */
-#define bLT "l"           /* Left top corner           */
-#define bRT "k"           /* Right top corner          */
-#define bLB "m"           /* Left bottom corner        */
-#define bRB "j"           /* Right bottom corner       */
-#define bX "n"            /* Cross                     */
-#define bVR "t"           /* Vertical, branch right    */
-#define bVL "u"           /* Vertical, branch left     */
-#define bHT "v"           /* Horizontal, branch top    */
-#define bHB "w"           /* Horizontal, branch bottom */
+#define SET_G1 "\x1b)0"                        /* Set G1 for box drawing    */
+#define RESET_G1 "\x1b)B"                      /* Reset G1 to ASCII         */
+#define bSTART "\x0e"                          /* Enter G1 drawing mode     */
+#define bSTOP "\x0f"                           /* Leave G1 drawing mode     */
+#define bH "q"                                 /* Horizontal line           */
+#define bV "x"                                 /* Vertical line             */
+#define bLT "l"                                /* Left top corner           */
+#define bRT "k"                                /* Right top corner          */
+#define bLB "m"                                /* Left bottom corner        */
+#define bRB "j"                                /* Right bottom corner       */
+#define bX "n"                                 /* Cross                     */
+#define bVR "t"                                /* Vertical, branch right    */
+#define bVL "u"                                /* Vertical, branch left     */
+#define bHT "v"                                /* Horizontal, branch top    */
+#define bHB "w"                                /* Horizontal, branch bottom */
 
 #else
 
@@ -147,7 +147,7 @@
 #define bHT "+"
 #define bHB "+"
 
-#endif /* ^FANCY_BOXES */
+#endif                                                      /* ^FANCY_BOXES */
 
 /***********************
  * Misc terminal codes *
@@ -169,7 +169,7 @@
 #define SAYF(x...) printf(x)
 #else
 #define SAYF(x...) fprintf(stderr, x)
-#endif /* ^MESSAGES_TO_STDOUT */
+#endif                                               /* ^MESSAGES_TO_STDOUT */
 
 /* Show a prefixed warning. */
 
@@ -286,5 +286,5 @@
                                                                \
   } while (0)
 
-#endif /* ! _HAVE_DEBUG_H */
+#endif                                                   /* ! _HAVE_DEBUG_H */
 
diff --git a/include/forkserver.h b/include/forkserver.h
index d40af87c..9a099888 100644
--- a/include/forkserver.h
+++ b/include/forkserver.h
@@ -3,9 +3,9 @@
    ----------------------------------------
 
    Originally written by Michal Zalewski <lcamtuf@google.com>
-   
+
    Forkserver design by Jann Horn <jannhorn@googlemail.com>
-   
+
    Now maintained by by Marc Heuse <mh@mh-sec.de>,
                         Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
                         Andrea Fioraldi <andreafioraldi@gmail.com>
@@ -45,7 +45,7 @@ void init_forkserver(char **argv);
 #define MSG_ULIMIT_USAGE "      ( ulimit -Sv $[%llu << 10];"
 #else
 #define MSG_ULIMIT_USAGE "      ( ulimit -Sd $[%llu << 10];"
-#endif /* ^RLIMIT_AS */
+#endif                                                        /* ^RLIMIT_AS */
 
 #endif
 
diff --git a/include/hash.h b/include/hash.h
index 0ffaa410..7085df32 100644
--- a/include/hash.h
+++ b/include/hash.h
@@ -99,7 +99,7 @@ static inline u32 hash32(const void* key, u32 len, u32 seed) {
 
 }
 
-#endif /* ^__x86_64__ */
+#endif                                                       /* ^__x86_64__ */
 
-#endif /* !_HAVE_HASH_H */
+#endif                                                     /* !_HAVE_HASH_H */
 
diff --git a/include/sharedmem.h b/include/sharedmem.h
index 3fbfe664..18e4ee9f 100644
--- a/include/sharedmem.h
+++ b/include/sharedmem.h
@@ -3,9 +3,9 @@
    ---------------------------------------------------
 
    Originally written by Michal Zalewski <lcamtuf@google.com>
-   
+
    Forkserver design by Jann Horn <jannhorn@googlemail.com>
-   
+
    Now maintained by by Marc Heuse <mh@mh-sec.de>,
                         Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
                         Andrea Fioraldi <andreafioraldi@gmail.com>
diff --git a/include/types.h b/include/types.h
index baf68401..07fc7e91 100644
--- a/include/types.h
+++ b/include/types.h
@@ -3,7 +3,7 @@
    --------------------------------------------------------
 
    Originally written by Michal Zalewski <lcamtuf@google.com>
-   
+
    Now maintained by by Marc Heuse <mh@mh-sec.de>,
                         Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
                         Andrea Fioraldi <andreafioraldi@gmail.com>
@@ -49,7 +49,7 @@ typedef uint32_t u32;
 typedef unsigned long long u64;
 #else
 typedef uint64_t u64;
-#endif /* ^__x86_64__ */
+#endif                                                       /* ^__x86_64__ */
 
 typedef int8_t  s8;
 typedef int16_t s16;
@@ -59,7 +59,7 @@ typedef int64_t s64;
 #ifndef MIN
 #define MIN(_a, _b) ((_a) > (_b) ? (_b) : (_a))
 #define MAX(_a, _b) ((_a) > (_b) ? (_a) : (_b))
-#endif /* !MIN */
+#endif                                                              /* !MIN */
 
 #define SWAP16(_x)                    \
   ({                                  \
@@ -82,7 +82,7 @@ typedef int64_t s64;
 #define AFL_R(x) (random() % (x))
 #else
 #define R(x) (random() % (x))
-#endif /* ^AFL_LLVM_PASS */
+#endif                                                    /* ^AFL_LLVM_PASS */
 
 #define STRINGIFY_INTERNAL(x) #x
 #define STRINGIFY(x) STRINGIFY_INTERNAL(x)
@@ -97,5 +97,5 @@ typedef int64_t s64;
 #define unlikely(_x) __builtin_expect(!!(_x), 0)
 #endif
 
-#endif /* ! _HAVE_TYPES_H */
+#endif                                                   /* ! _HAVE_TYPES_H */