switched to clang-format-10

This commit is contained in:
van Hauser 2020-04-20 11:32:44 +02:00
parent 4c90293e44
commit b6a15d9719
3 changed files with 7 additions and 6 deletions

View File

@ -29,14 +29,14 @@ CLANG_FORMAT_BIN = os.getenv("CLANG_FORMAT_BIN")
if CLANG_FORMAT_BIN is None: if CLANG_FORMAT_BIN is None:
o = 0 o = 0
try: 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, _ = p.communicate()
o = str(o, "utf-8") o = str(o, "utf-8")
o = o[len("clang-format version "):].strip() o = o[len("clang-format version "):].strip()
o = o[:o.find(".")] o = o[:o.find(".")]
o = int(o) o = int(o)
except: except:
print ("clang-format-8 is needed. Aborted.") print ("clang-format-10 is needed. Aborted.")
exit(1) exit(1)
#if o < 7: #if o < 7:
# if subprocess.call(['which', 'clang-format-7'], stdout=subprocess.PIPE) == 0: # 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.") # print ("clang-format 7 or above is needed. Aborted.")
# exit(1) # exit(1)
else: else:
CLANG_FORMAT_BIN = 'clang-format-8' CLANG_FORMAT_BIN = 'clang-format-10'
COLUMN_LIMIT = 80 COLUMN_LIMIT = 80
for line in fmt.split("\n"): for line in fmt.split("\n"):

View File

@ -608,8 +608,9 @@ typedef struct afl_state {
u8 * ex_buf; u8 * ex_buf;
size_t ex_size; 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 */ /* this is a fixed buffer of size map_size that can be used by any function if
u8 * map_tmp_buf; * they do not call another function */
u8 *map_tmp_buf;
} afl_state_t; } afl_state_t;

View File

@ -105,7 +105,7 @@ static inline void *shmat(int __shmid, const void *__shmaddr, int __shmflg) {
} }
#endif /* __ANDROID__ */ #endif /* __ANDROID__ */
#endif #endif