From 86bce103a69897c7938317de96b27bd323897290 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" <ldv@altlinux.org> Date: Sat, 17 Jun 2017 19:08:36 +0000 Subject: [PATCH] Fix function prototypes with unspecified arguments Change functions declared as taking unspecified number of arguments of unspecified type to functions that take no arguments. Reported by kernel's checkpatch.pl script. --- strace.c | 4 ++-- test/mmap_offset_decode.c | 4 +++- test/mtd.c | 4 +++- test/sig.c | 6 ++++-- test/ubi.c | 4 +++- test/wait_must_be_interruptible.c | 9 ++++++--- 6 files changed, 21 insertions(+), 10 deletions(-) diff --git a/strace.c b/strace.c index 3af9e4fb..ba2d6953 100644 --- a/strace.c +++ b/strace.c @@ -2319,7 +2319,7 @@ next_event(int *pstatus, siginfo_t *si) /* * Used to exit simply when nprocs hits zero, but in this testcase: - * int main() { _exit(!!fork()); } + * int main(void) { _exit(!!fork()); } * under strace -f, parent sometimes (rarely) manages * to exit before we see the first stop of the child, * and we are losing track of it: @@ -2594,7 +2594,7 @@ dispatch_event(enum trace_event ret, int *pstatus, siginfo_t *si) } #ifdef ENABLE_COVERAGE_GCOV -extern void __gcov_flush(); +extern void __gcov_flush(void); #endif static void ATTRIBUTE_NORETURN diff --git a/test/mmap_offset_decode.c b/test/mmap_offset_decode.c index 34a708e2..a2b1c027 100644 --- a/test/mmap_offset_decode.c +++ b/test/mmap_offset_decode.c @@ -22,7 +22,9 @@ #define _FILE_OFFSET_BITS 64 #include <sys/mman.h> #include <errno.h> -int main() + +int +main(void) { /* 0x1000 is meant to be page size multiplier */ mmap(0, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, diff --git a/test/mtd.c b/test/mtd.c index b9fc6957..c8c25ae0 100644 --- a/test/mtd.c +++ b/test/mtd.c @@ -6,7 +6,9 @@ #include <sys/ioctl.h> #include <mtd/mtd-user.h> -int main() { +int +main(void) +{ int fd = open("/dev/null", 0); struct mtd_info_user minfo; struct erase_info_user einfo; diff --git a/test/sig.c b/test/sig.c index 1678b022..2c1bd45d 100644 --- a/test/sig.c +++ b/test/sig.c @@ -2,12 +2,14 @@ #include <signal.h> #include <unistd.h> -void interrupt() +static void +interrupt(void) { write(2, "xyzzy\n", 6); } -int main(int argc, char *argv[]) +int +main(int argc, char *argv[]) { char buf[1024]; diff --git a/test/ubi.c b/test/ubi.c index 5062c836..774ba58e 100644 --- a/test/ubi.c +++ b/test/ubi.c @@ -9,7 +9,9 @@ #define zero(x) memset(&x, 0, sizeof(x)) -int main() { +int +main(void) +{ int fd = open("/dev/null", 0); struct ubi_mkvol_req mkvol = { .vol_id = 3, diff --git a/test/wait_must_be_interruptible.c b/test/wait_must_be_interruptible.c index 3fb34497..5943a57b 100644 --- a/test/wait_must_be_interruptible.c +++ b/test/wait_must_be_interruptible.c @@ -18,12 +18,14 @@ static const char msg1[] = "Child signals parent\n"; static const char msg2[] = "Parent got signal\n"; static const char msg3[] = "Child will exit now\n"; -static void handler(int s) +static void +handler(int s) { write(1, msg2, sizeof(msg2)-1); } -static void test() +static void +test(void) { /* Note: in Linux, signal() installs handler with SA_RESTART flag, * therefore wait will be restarted. @@ -45,7 +47,8 @@ static void test() _exit(0); } -int main() +int +main(void) { char buf1[80]; char buf2[80]; -- 2.40.0