diff options
| author | van Hauser <vh@thc.org> | 2020-04-20 11:32:44 +0200 |
|---|---|---|
| committer | van Hauser <vh@thc.org> | 2020-04-20 11:32:44 +0200 |
| commit | b6a15d9719fd93ebbc885b9c53ae21f7bd325ee0 (patch) | |
| tree | ed87581597b0564015cf600234a9b06e48110975 | |
| parent | 4c90293e447a6e43129b39e14a72cbad38704522 (diff) | |
| download | afl++-b6a15d9719fd93ebbc885b9c53ae21f7bd325ee0.tar.gz | |
switched to clang-format-10
| -rwxr-xr-x | .custom-format.py | 6 | ||||
| -rw-r--r-- | include/afl-fuzz.h | 5 | ||||
| -rw-r--r-- | include/android-ashmem.h | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/.custom-format.py b/.custom-format.py index e3779b68..164815b1 100755 --- a/.custom-format.py +++ b/.custom-format.py @@ -29,14 +29,14 @@ CLANG_FORMAT_BIN = os.getenv("CLANG_FORMAT_BIN") if CLANG_FORMAT_BIN is None: o = 0 try: - p = subprocess.Popen(["clang-format-8", "--version"], stdout=subprocess.PIPE) + p = subprocess.Popen(["clang-format-10", "--version"], stdout=subprocess.PIPE) o, _ = p.communicate() o = str(o, "utf-8") o = o[len("clang-format version "):].strip() o = o[:o.find(".")] o = int(o) except: - print ("clang-format-8 is needed. Aborted.") + print ("clang-format-10 is needed. Aborted.") exit(1) #if o < 7: # if subprocess.call(['which', 'clang-format-7'], stdout=subprocess.PIPE) == 0: @@ -51,7 +51,7 @@ if CLANG_FORMAT_BIN is None: # print ("clang-format 7 or above is needed. Aborted.") # exit(1) else: - CLANG_FORMAT_BIN = 'clang-format-8' + CLANG_FORMAT_BIN = 'clang-format-10' COLUMN_LIMIT = 80 for line in fmt.split("\n"): diff --git a/include/afl-fuzz.h b/include/afl-fuzz.h index 6c349ea7..428bfa8e 100644 --- a/include/afl-fuzz.h +++ b/include/afl-fuzz.h @@ -608,8 +608,9 @@ typedef struct afl_state { u8 * ex_buf; size_t ex_size; - /* this is a fixed buffer of size map_size that can be used by any function if they do not call another function */ - u8 * map_tmp_buf; + /* this is a fixed buffer of size map_size that can be used by any function if + * they do not call another function */ + u8 *map_tmp_buf; } afl_state_t; diff --git a/include/android-ashmem.h b/include/android-ashmem.h index 5d99dd48..0dea0583 100644 --- a/include/android-ashmem.h +++ b/include/android-ashmem.h @@ -105,7 +105,7 @@ static inline void *shmat(int __shmid, const void *__shmaddr, int __shmflg) { } -#endif /* __ANDROID__ */ +#endif /* __ANDROID__ */ #endif |