diff options
| author | Andrey Konovalov <andreyknvl@google.com> | 2019-04-08 14:20:26 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2019-04-09 10:53:11 +0200 |
| commit | e619f52452849cfe06939fbb73a9efbbbd57ffd6 (patch) | |
| tree | 125a347f0389c90392eff50cb83c994f04993416 /pkg | |
| parent | 995065ff4180c5a69912d9ced947b240b9e3ae4d (diff) | |
csource: use /*FOO*/ instead of [[FOO]]
The latter differently confuses different versions of clang-format.
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/csource/common.go | 2 | ||||
| -rw-r--r-- | pkg/csource/generated.go | 19 |
2 files changed, 11 insertions, 10 deletions
diff --git a/pkg/csource/common.go b/pkg/csource/common.go index 07f7c40de..204256df2 100644 --- a/pkg/csource/common.go +++ b/pkg/csource/common.go @@ -50,7 +50,7 @@ func createCommonHeader(p, mmapProg *prog.Prog, replacements map[string]string, } for from, to := range replacements { - src = bytes.Replace(src, []byte("[["+from+"]]"), []byte(to), -1) + src = bytes.Replace(src, []byte("/*"+from+"*/"), []byte(to), -1) } for from, to := range map[string]string{ diff --git a/pkg/csource/generated.go b/pkg/csource/generated.go index 7d07a418e..71a38106b 100644 --- a/pkg/csource/generated.go +++ b/pkg/csource/generated.go @@ -4588,7 +4588,7 @@ static void loop(void) int collide = 0; again: #endif - for (call = 0; call < [[NUM_CALLS]]; call++) { + for (call = 0; call < /*NUM_CALLS*/; call++) { for (thread = 0; thread < (int)(sizeof(threads) / sizeof(threads[0])); thread++) { struct thread_t* th = &threads[thread]; if (!th->created) { @@ -4655,7 +4655,7 @@ static void loop(void) #endif int iter; #if SYZ_REPEAT_TIMES - for (iter = 0; iter < [[REPEAT_TIMES]]; iter++) { + for (iter = 0; iter < /*REPEAT_TIMES*/; iter++) { #else for (iter = 0;; iter++) { #endif @@ -4755,10 +4755,11 @@ static void loop(void) } #endif #endif + #if !SYZ_EXECUTOR -[[SYSCALL_DEFINES]] +/*SYSCALL_DEFINES*/ -[[RESULTS]] +/*RESULTS*/ #if SYZ_THREADED || SYZ_REPEAT || SYZ_SANDBOX_NONE || SYZ_SANDBOX_SETUID || SYZ_SANDBOX_NAMESPACE || SYZ_SANDBOX_ANDROID_UNTRUSTED_APP #if SYZ_THREADED @@ -4769,7 +4770,7 @@ void execute_one(void) void loop(void) #endif { - [[SYSCALLS]] + /*SYSCALLS*/ } #endif #if GOOS_akaros && SYZ_REPEAT @@ -4777,7 +4778,7 @@ void loop(void) int main(int argc, char** argv) { - [[MMAP_DATA]] + /*MMAP_DATA*/ program_name = argv[0]; if (argc == 2 && strcmp(argv[1], "child") == 0) @@ -4785,20 +4786,20 @@ int main(int argc, char** argv) #else int main(void) { - [[MMAP_DATA]] + /*MMAP_DATA*/ #endif #if SYZ_HANDLE_SEGV install_segv_handler(); #endif #if SYZ_PROCS - for (procid = 0; procid < [[PROCS]]; procid++) { + for (procid = 0; procid < /*PROCS*/; procid++) { if (fork() == 0) { #endif #if SYZ_USE_TMP_DIR || SYZ_SANDBOX_ANDROID_UNTRUSTED_APP use_temporary_dir(); #endif - [[SANDBOX_FUNC]] + /*SANDBOX_FUNC*/ #if SYZ_PROCS } } |