From fb3c37a3c63ab582cad81f9f379c8ae08695ceab Mon Sep 17 00:00:00 2001 From: Julien Rische Date: Sat, 22 Jan 2022 23:47:16 +0100 Subject: [PATCH] Update clang format --- .clang-format | 5 ++++- c2run.c | 18 +++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.clang-format b/.clang-format index 4934587..eb8c7e1 100644 --- a/.clang-format +++ b/.clang-format @@ -1,5 +1,8 @@ --- BasedOnStyle: LLVM IndentWidth: 4 -ColumnLimit: 80 +ColumnLimit: 100 SortIncludes: false +BreakBeforeBraces: Custom +BraceWrapping: + AfterFunction: true diff --git a/c2run.c b/c2run.c index 2b259a3..89a2619 100644 --- a/c2run.c +++ b/c2run.c @@ -37,7 +37,8 @@ const char *header = "#include \n" "(void) argv;\n" "(void) envp;\n"; -void exec_cc(int pipe, char *output_path, size_t argc, char *argv[]) { +void exec_cc(int pipe, char *output_path, size_t argc, char *argv[]) +{ size_t cc_argc; char **cc_argv; char *cc = getenv("CC") ?: "gcc"; @@ -54,8 +55,7 @@ void exec_cc(int pipe, char *output_path, size_t argc, char *argv[]) { _exit(1); } - memcpy(cc_argv, (char *[]){cc, "-xc", "-o", output_path}, - 4 * sizeof(char *)); + memcpy(cc_argv, (char *[]){cc, "-xc", "-o", output_path}, 4 * sizeof(char *)); memcpy(cc_argv + 4, argv, argc * sizeof(*argv)); memcpy(cc_argv + (cc_argc - 2), (char *[]){"-", NULL}, 2 * sizeof(char *)); @@ -64,7 +64,8 @@ void exec_cc(int pipe, char *output_path, size_t argc, char *argv[]) { _exit(1); } -err_t pipe_source(int pipe, const char *src_path, int input) { +err_t pipe_source(int pipe, const char *src_path, int input) +{ ssize_t len; if (src_path) { @@ -96,7 +97,8 @@ err_t pipe_source(int pipe, const char *src_path, int input) { return 0; } -int main(int argc, char *argv[], char *envp[]) { +int main(int argc, char *argv[], char *envp[]) +{ err_t err; int ret = 0; size_t cc_argc = (size_t)argc - 1; @@ -168,10 +170,8 @@ int main(int argc, char *argv[], char *envp[]) { { int status; - if (waitpid(cc_pid, &status, 0) != cc_pid || - (!WIFEXITED(status) || WEXITSTATUS(status))) { - fprintf(stderr, - "Error: compiler process did not complete successfully\n"); + if (waitpid(cc_pid, &status, 0) != cc_pid || (!WIFEXITED(status) || WEXITSTATUS(status))) { + fprintf(stderr, "Error: compiler process did not complete successfully\n"); ret = 1; goto end; } -- 2.11.4.GIT