Index: uspace/app/bdsh/cmds/modules/cat/cat.c =================================================================== --- uspace/app/bdsh/cmds/modules/cat/cat.c (revision 06839924fc857d2f207b42b53527b04121ef63a5) +++ uspace/app/bdsh/cmds/modules/cat/cat.c (revision 193d280c34f38846eccfa1ecce71975f9ad92398) @@ -108,5 +108,5 @@ } -static void waitprompt() +static void waitprompt(void) { console_set_pos(console, 0, console_rows-1); @@ -120,5 +120,5 @@ } -static void waitkey() +static void waitkey(void) { cons_event_t ev; @@ -149,5 +149,5 @@ } -static void newpage() +static void newpage(void) { console_clear(console); Index: uspace/app/bdsh/input.c =================================================================== --- uspace/app/bdsh/input.c (revision 06839924fc857d2f207b42b53527b04121ef63a5) +++ uspace/app/bdsh/input.c (revision 193d280c34f38846eccfa1ecce71975f9ad92398) @@ -219,5 +219,5 @@ } -void print_pipe_usage() +void print_pipe_usage(void) { printf("Invalid syntax!\n"); Index: uspace/app/trace/trace.c =================================================================== --- uspace/app/trace/trace.c (revision 06839924fc857d2f207b42b53527b04121ef63a5) +++ uspace/app/trace/trace.c (revision 193d280c34f38846eccfa1ecce71975f9ad92398) @@ -730,5 +730,5 @@ } -static void print_syntax() +static void print_syntax(void) { printf("Syntax:\n"); Index: uspace/drv/bus/usb/vhc/devconn.c =================================================================== --- uspace/drv/bus/usb/vhc/devconn.c (revision 06839924fc857d2f207b42b53527b04121ef63a5) +++ uspace/drv/bus/usb/vhc/devconn.c (revision 193d280c34f38846eccfa1ecce71975f9ad92398) @@ -32,5 +32,5 @@ -static vhc_virtdev_t *vhc_virtdev_create() +static vhc_virtdev_t *vhc_virtdev_create(void) { vhc_virtdev_t *dev = malloc(sizeof(vhc_virtdev_t)); Index: uspace/lib/c/generic/getopt.c =================================================================== --- uspace/lib/c/generic/getopt.c (revision 06839924fc857d2f207b42b53527b04121ef63a5) +++ uspace/lib/c/generic/getopt.c (revision 193d280c34f38846eccfa1ecce71975f9ad92398) @@ -95,11 +95,8 @@ * Compute the greatest common divisor of a and b. */ -static int -gcd(a, b) - int a; - int b; +static int gcd(int a, int b) { int c; - + c = a % b; while (c != 0) { @@ -108,5 +105,5 @@ c = a % b; } - + return b; } @@ -117,10 +114,6 @@ * in each block). */ -static void -permute_args(panonopt_start, panonopt_end, opt_end, nargv) - int panonopt_start; - int panonopt_end; - int opt_end; - char **nargv; +static void permute_args(int panonopt_start, int panonopt_end, int opt_end, + char **nargv) { int cstart, cyclelen, i, j, ncycle, nnonopts, nopts, pos; @@ -157,9 +150,5 @@ * Returns -2 if -- is found (can be long option or end of options marker). */ -static int -getopt_internal(nargc, nargv, options) - int nargc; - char **nargv; - const char *options; +static int getopt_internal(int nargc, char **nargv, const char *options) { const char *oli; /* option letter list index */ @@ -299,9 +288,5 @@ * Parse argc/argv argument vector. */ -int -getopt(nargc, nargv, options) - int nargc; - char * const *nargv; - const char *options; +int getopt(int nargc, char * const *nargv, const char *options) { int retval; @@ -332,11 +317,6 @@ * Parse argc/argv argument vector. */ -int -getopt_long(nargc, nargv, options, long_options, idx) - int nargc; - char * const *nargv; - const char *options; - const struct option *long_options; - int *idx; +int getopt_long(int nargc, char * const *nargv, const char *options, + const struct option *long_options, int *idx) { int retval; Index: uspace/lib/ieee80211/src/ieee80211.c =================================================================== --- uspace/lib/ieee80211/src/ieee80211.c (revision 06839924fc857d2f207b42b53527b04121ef63a5) +++ uspace/lib/ieee80211/src/ieee80211.c (revision 193d280c34f38846eccfa1ecce71975f9ad92398) @@ -718,5 +718,5 @@ * */ -ieee80211_dev_t *ieee80211_device_create() +ieee80211_dev_t *ieee80211_device_create(void) { return calloc(1, sizeof(ieee80211_dev_t)); Index: uspace/lib/pcut/src/run.c =================================================================== --- uspace/lib/pcut/src/run.c (revision 06839924fc857d2f207b42b53527b04121ef63a5) +++ uspace/lib/pcut/src/run.c (revision 193d280c34f38846eccfa1ecce71975f9ad92398) @@ -73,8 +73,9 @@ static int default_suite_initialized = 0; -static void init_default_suite_when_needed() { - if (default_suite_initialized) { +static void init_default_suite_when_needed(void) +{ + if (default_suite_initialized) return; - } + default_suite.id = -1; default_suite.kind = PCUT_KIND_TESTSUITE; @@ -91,11 +92,13 @@ * @return Always a valid test suite item. */ -static pcut_item_t *pcut_find_parent_suite(pcut_item_t *it) { +static pcut_item_t *pcut_find_parent_suite(pcut_item_t *it) +{ while (it != NULL) { - if (it->kind == PCUT_KIND_TESTSUITE) { + if (it->kind == PCUT_KIND_TESTSUITE) return it; - } + it = it->previous; } + init_default_suite_when_needed(); return &default_suite; @@ -106,8 +109,8 @@ * @param func Function to run (can be NULL). */ -static void run_setup_teardown(pcut_setup_func_t func) { - if (func != NULL) { +static void run_setup_teardown(pcut_setup_func_t func) +{ + if (func != NULL) func(); - } } @@ -119,11 +122,11 @@ * @param outcome Outcome of the current test. */ -static void leave_test(int outcome) { +static void leave_test(int outcome) +{ PCUT_DEBUG("leave_test(outcome=%d), will_exit=%s", outcome, - leave_means_exit ? "yes" : "no"); - if (leave_means_exit) { + leave_means_exit ? "yes" : "no"); + if (leave_means_exit) exit(outcome); - } - + #ifndef PCUT_NO_LONG_JUMP longjmp(start_test_jump, 1); @@ -138,6 +141,8 @@ * @param message Message describing the failure. */ -void pcut_failed_assertion(const char *message) { +void pcut_failed_assertion(const char *message) +{ static const char *prev_message = NULL; + /* * The assertion failed. We need to abort the current test, @@ -145,13 +150,12 @@ * include running the tear-down routine. */ - if (print_test_error) { + if (print_test_error) pcut_print_fail_message(message); - } - + if (execute_teardown_on_failure) { execute_teardown_on_failure = 0; prev_message = message; run_setup_teardown(current_suite->teardown_func); - + /* Tear-down was okay. */ if (report_test_result) { @@ -165,7 +169,7 @@ } } - + prev_message = NULL; - + leave_test(TEST_OUTCOME_FAIL); /* No return. */ } @@ -176,5 +180,6 @@ * @return Error status (zero means success). */ -static int run_test(pcut_item_t *test) { +static int run_test(pcut_item_t *test) +{ /* * Set here as the returning point in case of test failure. @@ -182,20 +187,19 @@ * test execution. */ + #ifndef PCUT_NO_LONG_JUMP int test_finished = setjmp(start_test_jump); - if (test_finished) { + if (test_finished) return 1; - } #endif - - if (report_test_result) { + + if (report_test_result) pcut_report_test_start(test); - } - + current_suite = pcut_find_parent_suite(test); current_test = test; - + pcut_hook_before_test(test); - + /* * If anything goes wrong, execute the tear-down function @@ -203,10 +207,10 @@ */ execute_teardown_on_failure = 1; - + /* * Run the set-up function. */ run_setup_teardown(current_suite->setup_func); - + /* * The setup function was performed, it is time to run @@ -214,5 +218,5 @@ */ test->test_func(); - + /* * Finally, run the tear-down function. We need to clear @@ -221,14 +225,13 @@ execute_teardown_on_failure = 0; run_setup_teardown(current_suite->teardown_func); - + /* * If we got here, it means everything went well with * this test. */ - if (report_test_result) { + if (report_test_result) pcut_report_test_done(current_test, TEST_OUTCOME_PASS, - NULL, NULL, NULL); - } - + NULL, NULL, NULL); + return 0; } @@ -242,16 +245,15 @@ * @return Error status (zero means success). */ -int pcut_run_test_forked(pcut_item_t *test) { - int rc; - +int pcut_run_test_forked(pcut_item_t *test) +{ report_test_result = 0; print_test_error = 1; leave_means_exit = 1; - - rc = run_test(test); - + + int rc = run_test(test); + current_test = NULL; current_suite = NULL; - + return rc; } @@ -265,16 +267,15 @@ * @return Error status (zero means success). */ -int pcut_run_test_single(pcut_item_t *test) { - int rc; - +int pcut_run_test_single(pcut_item_t *test) +{ report_test_result = 1; print_test_error = 0; leave_means_exit = 0; - - rc = run_test(test); - + + int rc = run_test(test); + current_test = NULL; current_suite = NULL; - + return rc; } @@ -285,16 +286,16 @@ * @return Timeout in seconds. */ -int pcut_get_test_timeout(pcut_item_t *test) { +int pcut_get_test_timeout(pcut_item_t *test) +{ int timeout = PCUT_DEFAULT_TEST_TIMEOUT; pcut_extra_t *extras = test->extras; - - + while (extras->type != PCUT_EXTRA_LAST) { - if (extras->type == PCUT_EXTRA_TIMEOUT) { + if (extras->type == PCUT_EXTRA_TIMEOUT) timeout = extras->timeout; - } + extras++; } - + return timeout; } Index: uspace/lib/posix/source/signal.c =================================================================== --- uspace/lib/posix/source/signal.c (revision 06839924fc857d2f207b42b53527b04121ef63a5) +++ uspace/lib/posix/source/signal.c (revision 193d280c34f38846eccfa1ecce71975f9ad92398) @@ -382,5 +382,5 @@ * Raise all unblocked previously queued signals. */ -static void _dequeue_unblocked_signals() +static void _dequeue_unblocked_signals(void) { link_t *iterator = _signal_queue.head.next; Index: uspace/srv/bd/sata_bd/sata_bd.c =================================================================== --- uspace/srv/bd/sata_bd/sata_bd.c (revision 06839924fc857d2f207b42b53527b04121ef63a5) +++ uspace/srv/bd/sata_bd/sata_bd.c (revision 193d280c34f38846eccfa1ecce71975f9ad92398) @@ -147,5 +147,5 @@ * */ -static int get_sata_disks() +static int get_sata_disks(void) { devman_handle_t root_fun; Index: uspace/srv/klog/klog.c =================================================================== --- uspace/srv/klog/klog.c (revision 06839924fc857d2f207b42b53527b04121ef63a5) +++ uspace/srv/klog/klog.c (revision 193d280c34f38846eccfa1ecce71975f9ad92398) @@ -51,5 +51,5 @@ #include -#define NAME "klog" +#define NAME "klog" typedef size_t __attribute__ ((aligned(1))) unaligned_size_t; @@ -98,5 +98,5 @@ * */ -static void producer() +static void producer(void) { int read = klog_read(buffer, BUFFER_SIZE);