From 96c920e166b40bbe50f216e294f2efac154a1cb2 Mon Sep 17 00:00:00 2001 From: Fred Barclay Date: Wed, 24 May 2017 14:13:52 -0500 Subject: Remove trailing whitespace from src/ --- src/tools/extract_caps.c | 18 +++++++++--------- src/tools/extract_syscalls.c | 16 ++++++++-------- src/tools/mkcoverit.sh | 2 +- src/tools/rvtest.c | 20 ++++++++++---------- src/tools/unixsocket.c | 4 ++-- 5 files changed, 30 insertions(+), 30 deletions(-) (limited to 'src/tools') diff --git a/src/tools/extract_caps.c b/src/tools/extract_caps.c index 66d86e1a6..b33fdf61f 100644 --- a/src/tools/extract_caps.c +++ b/src/tools/extract_caps.c @@ -29,14 +29,14 @@ int main(int argc, char **argv) { printf("usage: %s /usr/include/linux/capability.h\n", argv[0]); return 1; } - + //open file FILE *fp = fopen(argv[1], "r"); if (!fp) { fprintf(stderr, "Error: cannot open file\n"); return 1; } - + // read file char buf[BUFMAX]; while (fgets(buf, BUFMAX, fp)) { @@ -47,12 +47,12 @@ int main(int argc, char **argv) { char *end = strchr(start, '\n'); if (end) *end = '\0'; - + // parsing if (strncmp(start, "#define CAP_", 12) == 0) { if (strstr(start, "CAP_LAST_CAP")) break; - + char *ptr1 = start + 8; char *ptr2 = ptr1; while (*ptr2 == ' ' || *ptr2 == '\t') @@ -60,7 +60,7 @@ int main(int argc, char **argv) { while (*ptr2 != ' ' && *ptr2 != '\t') ptr2++; *ptr2 = '\0'; - + ptr2 = strdup(ptr1); assert(ptr2); ptr2 += 4; @@ -69,14 +69,14 @@ int main(int argc, char **argv) { *ptr3 = tolower(*ptr3); ptr3++; } - - + + printf("#ifdef %s\n", ptr1); printf("\t{\"%s\", %s },\n", ptr2, ptr1); printf("#endif\n"); - + } - + } fclose(fp); return 0; diff --git a/src/tools/extract_syscalls.c b/src/tools/extract_syscalls.c index 9af24b8cd..4dad0d2b6 100644 --- a/src/tools/extract_syscalls.c +++ b/src/tools/extract_syscalls.c @@ -28,14 +28,14 @@ int main(int argc, char **argv) { printf("usage: %s /usr/include/x86_64-linux-gnu/bits/syscall.h\n", argv[0]); return 1; } - + //open file FILE *fp = fopen(argv[1], "r"); if (!fp) { fprintf(stderr, "Error: cannot open file\n"); return 1; } - + // read file char buf[BUFMAX]; while (fgets(buf, BUFMAX, fp)) { @@ -46,7 +46,7 @@ int main(int argc, char **argv) { char *end = strchr(start, '\n'); if (end) *end = '\0'; - + // parsing if (strncmp(start, "# error", 7) == 0) continue; @@ -66,7 +66,7 @@ int main(int argc, char **argv) { return 1; } *(ptr2 - 1) = '\0'; - + char *ptr3 = ptr1; while (*ptr3 != ' ' && *ptr3 != '\t' && *ptr3 != '\0') ptr3++; @@ -75,17 +75,17 @@ int main(int argc, char **argv) { while (*ptr3 != ' ' && *ptr3 != '\t' && *ptr3 != '\0') ptr3++; *ptr3 = '\0'; - + ptr3 = ptr1; while (*ptr3 != '_') ptr3++; ptr3++; - + printf("#ifdef %s\n", ptr1); printf("#ifdef %s\n", ptr2); printf("\t{\"%s\", %s},\n", ptr3, ptr2); - printf("#endif\n"); - printf("#endif\n"); + printf("#endif\n"); + printf("#endif\n"); } } fclose(fp); diff --git a/src/tools/mkcoverit.sh b/src/tools/mkcoverit.sh index 65b06f9fa..d4a68e397 100755 --- a/src/tools/mkcoverit.sh +++ b/src/tools/mkcoverit.sh @@ -29,7 +29,7 @@ then pwd ./configure --prefix=/usr cd .. - + else echo "Error: firetools source archive missing" exit 1 diff --git a/src/tools/rvtest.c b/src/tools/rvtest.c index d108672d2..3432ab9b4 100644 --- a/src/tools/rvtest.c +++ b/src/tools/rvtest.c @@ -64,7 +64,7 @@ int main(int argc, char **argv) { // open test file char *fname = argv[1]; FILE *fp = fopen(fname, "r"); - + // read test file char buf[MAXBUF]; int line = 0; @@ -80,22 +80,22 @@ int main(int argc, char **argv) { *ptr ='\0'; if (*start == '\0') continue; - + // skip comments if (*start == '#') continue; ptr = strchr(start, '#'); if (ptr) *ptr = '\0'; - - // extract exit status + + // extract exit status int status; int rv = sscanf(start, "%d\n", &status); if (rv != 1) { fprintf(stderr, "Error: invalid line %d in %s\n", line, fname); exit(1); } - + // extract command char *cmd = strchr(start, ' '); if (!cmd) { @@ -124,21 +124,21 @@ int main(int argc, char **argv) { // parent else { int exit_status; - + alarm(TIMEOUT); pid = waitpid(pid, &exit_status, 0); if (pid == -1) { perror("waitpid"); exit(1); } - + if (WEXITSTATUS(exit_status) != status) printf("ERROR TESTING: %s\n", cmd); } - + fflush(0); } fclose(fp); - + return 0; -} \ No newline at end of file +} diff --git a/src/tools/unixsocket.c b/src/tools/unixsocket.c index 88475ea3e..c4302eed3 100644 --- a/src/tools/unixsocket.c +++ b/src/tools/unixsocket.c @@ -1,5 +1,5 @@ #include -#include +#include #include #include @@ -21,7 +21,7 @@ int main(void) { fprintf(stderr, "Error: cannot connect to socket\n"); return 1; } - + printf("connected to %s\n", socketpath); close(s); -- cgit v1.2.3-54-g00ecf