diff options
| -rw-r--r-- | filter/filter_test.c | 2 | ||||
| -rw-r--r-- | test/birdtest.c | 5 | ||||
| -rw-r--r-- | test/birdtest.h | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/filter/filter_test.c b/filter/filter_test.c index be7fd521..916290ed 100644 --- a/filter/filter_test.c +++ b/filter/filter_test.c @@ -29,7 +29,7 @@ parse_config_file(const void *filename_void) size_t fn_size = strlen((const char *) filename_void) + 1; char *filename = alloca(fn_size); - strncpy(filename, filename_void, fn_size); + memcpy(filename, filename_void, fn_size); struct config *c = bt_config_file_parse(filename); bt_bird_cleanup(); diff --git a/test/birdtest.c b/test/birdtest.c index d503890a..7b6fb0b5 100644 --- a/test/birdtest.c +++ b/test/birdtest.c @@ -149,10 +149,7 @@ int bt_run_test_fn(int (*fn)(const void *), const void *fn_arg, int timeout) int result; alarm(timeout); - if (fn_arg) - result = fn(fn_arg); - else - result = ((int (*)(void))fn)(); + result = fn(fn_arg); if (!bt_suite_result) result = 0; diff --git a/test/birdtest.h b/test/birdtest.h index b2d572d0..dacfb095 100644 --- a/test/birdtest.h +++ b/test/birdtest.h @@ -55,11 +55,13 @@ void bt_log_suite_case_result(int result, const char *fmt, ...); #define BT_PROMPT_FAIL_NO_COLOR " [" "FAIL" "] " #define BT_PROMPT_OK_FAIL_STRLEN 8 /* strlen ' [FAIL] ' */ +static inline int bt_test_fn_noarg(const void *cp) { return ((int (*)(void)) cp)(); } + #define bt_test_suite(fn, dsc, ...) \ bt_test_suite_extra(fn, BT_FORKING, BT_TIMEOUT, dsc, ##__VA_ARGS__) #define bt_test_suite_extra(fn, f, t, dsc, ...) \ - bt_test_suite_base((int (*)(const void *))fn, #fn, NULL, f, t, dsc, ##__VA_ARGS__) + bt_test_suite_base(bt_test_fn_noarg, #fn, fn, f, t, dsc, ##__VA_ARGS__) #define bt_test_suite_arg(fn, arg, dsc, ...) \ bt_test_suite_arg_extra(fn, arg, BT_FORKING, BT_TIMEOUT, dsc, ##__VA_ARGS__) |