From a28b624402aa0eac09ad93de5d1c5e6bccadcd82 Mon Sep 17 00:00:00 2001 From: Alexandra Ellwood Date: Mon, 10 Mar 2008 21:51:49 +0000 Subject: Remove C warnings Some C++ conventions in the CCAPI tests were producing warnings on C compilers. Fixed code to stop producing warnings. ticket: new git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20268 dc483132-0cff-0310-8789-dd5450dbe970 --- src/ccapi/test/simple_lock_test.c | 2 +- src/ccapi/test/test_ccapi_ccache.c | 2 +- src/ccapi/test/test_ccapi_ccache.h | 38 +++++++++++++++++------------------ src/ccapi/test/test_ccapi_check.c | 2 +- src/ccapi/test/test_ccapi_constants.c | 4 ++-- src/ccapi/test/test_ccapi_constants.h | 2 +- src/ccapi/test/test_ccapi_iterators.c | 2 +- src/ccapi/test/test_ccapi_iterators.h | 4 ++-- src/ccapi/test/test_ccapi_log.c | 2 +- src/ccapi/test/test_ccapi_util.c | 4 ++-- 10 files changed, 31 insertions(+), 31 deletions(-) (limited to 'src/ccapi/test') diff --git a/src/ccapi/test/simple_lock_test.c b/src/ccapi/test/simple_lock_test.c index d51a586..26bd74e 100644 --- a/src/ccapi/test/simple_lock_test.c +++ b/src/ccapi/test/simple_lock_test.c @@ -17,7 +17,7 @@ #endif -void * other_thread () { +void * other_thread (void) { cc_int32 err; cc_context_t context = NULL; diff --git a/src/ccapi/test/test_ccapi_ccache.c b/src/ccapi/test/test_ccapi_ccache.c index 7059f98..265804e 100644 --- a/src/ccapi/test/test_ccapi_ccache.c +++ b/src/ccapi/test/test_ccapi_ccache.c @@ -11,7 +11,7 @@ // --------------------------------------------------------------------------- -int check_cc_ccache_release() { +int check_cc_ccache_release(void) { cc_int32 err = 0; cc_context_t context = NULL; cc_ccache_t ccache = NULL; diff --git a/src/ccapi/test/test_ccapi_ccache.h b/src/ccapi/test/test_ccapi_ccache.h index 28a4fba..ecb0621 100644 --- a/src/ccapi/test/test_ccapi_ccache.h +++ b/src/ccapi/test/test_ccapi_ccache.h @@ -3,47 +3,47 @@ #include "test_ccapi_globals.h" -int check_cc_ccache_release(); +int check_cc_ccache_release(void); cc_int32 check_once_cc_ccache_release(cc_context_t context, cc_ccache_t ccache, cc_int32 expected_err, const char *description); -int check_cc_ccache_destroy(); +int check_cc_ccache_destroy(void); cc_int32 check_once_cc_ccache_destroy(cc_context_t context, cc_ccache_t ccache, cc_int32 expected_err, const char *description); -int check_cc_ccache_set_default(); +int check_cc_ccache_set_default(void); cc_int32 check_once_cc_ccache_set_default(cc_context_t context, cc_ccache_t ccache, cc_int32 expected_err, const char *description); -int check_cc_ccache_get_credentials_version(); +int check_cc_ccache_get_credentials_version(void); cc_int32 check_once_cc_ccache_get_credentials_version(cc_ccache_t ccache, cc_uint32 expected_cred_vers, cc_int32 expected_err, const char *description); -int check_cc_ccache_get_name(); +int check_cc_ccache_get_name(void); cc_int32 check_once_cc_ccache_get_name(cc_ccache_t ccache, const char *expected_name, cc_int32 expected_err, const char *description); -int check_cc_ccache_get_principal(); -cc_int32 check_once_ccache_get_principal(cc_ccache_t ccache, cc_uint32 cred_vers, const char *expected_principal, cc_int32 expected_err, const char *description); -int check_cc_ccache_set_principal(); +int check_cc_ccache_get_principal(void); +cc_int32 check_once_cc_ccache_get_principal(cc_ccache_t ccache, cc_uint32 cred_vers, const char *expected_principal, cc_int32 expected_err, const char *description); +int check_cc_ccache_set_principal(void); cc_int32 check_once_cc_ccache_set_principal(cc_ccache_t ccache, cc_uint32 cred_vers, const char *in_principal, cc_int32 expected_err, const char *description); -int check_cc_ccache_store_credentials(); +int check_cc_ccache_store_credentials(void); cc_int32 check_once_cc_ccache_store_credentials(cc_ccache_t ccache, const cc_credentials_union *credentials, cc_int32 expected_err, const char *description); -int check_cc_ccache_remove_credentials(); +int check_cc_ccache_remove_credentials(void); cc_int32 check_once_cc_ccache_remove_credentials(cc_ccache_t ccache, cc_credentials_t in_creds, cc_int32 expected_err, const char *description); -int check_cc_ccache_new_credentials_iterator(); +int check_cc_ccache_new_credentials_iterator(void); cc_int32 check_once_cc_ccache_new_credentials_iterator(cc_ccache_t ccache, cc_credentials_iterator_t *iterator, cc_int32 expected_err, const char *description); -int check_cc_ccache_get_change_time(); +int check_cc_ccache_get_change_time(void); cc_int32 check_once_cc_ccache_get_change_time(cc_ccache_t ccache, cc_time_t *last_time, cc_int32 expected_err, const char *description); -int check_cc_ccache_get_last_default_time(); -cc_int32 check_once_ccache_get_last_default_time(cc_ccache_t ccache, cc_time_t *last_time, cc_int32 expected_err, const char *description); +int check_cc_ccache_get_last_default_time(void); +cc_int32 check_once_cc_ccache_get_last_default_time(cc_ccache_t ccache, cc_time_t *last_time, cc_int32 expected_err, const char *description); -int check_cc_ccache_move(); +int check_cc_ccache_move(void); cc_int32 check_once_cc_ccache_move(cc_ccache_t source, cc_ccache_t destination, cc_int32 expected_err, const char *description); -int check_cc_ccache_compare(); +int check_cc_ccache_compare(void); cc_int32 check_once_cc_ccache_compare(cc_ccache_t ccache, cc_ccache_t compare_to, cc_uint32 *equal, cc_int32 expected_err, const char *description); -int check_cc_ccache_get_kdc_time_offset(); +int check_cc_ccache_get_kdc_time_offset(void); cc_int32 check_once_cc_ccache_get_kdc_time_offset(cc_ccache_t ccache, cc_int32 credentials_version, cc_time_t *time_offset, cc_int32 expected_err, const char *description); -int check_cc_ccache_set_kdc_time_offset(); +int check_cc_ccache_set_kdc_time_offset(void); cc_int32 check_once_cc_ccache_set_kdc_time_offset(cc_ccache_t ccache, cc_int32 credentials_version, cc_time_t time_offset, cc_int32 expected_err, const char *description); -int check_cc_ccache_clear_kdc_time_offset(); +int check_cc_ccache_clear_kdc_time_offset(void); cc_int32 check_once_cc_ccache_clear_kdc_time_offset(cc_ccache_t ccache, cc_int32 credentials_version, cc_int32 expected_err, const char *description); #endif /* _TEST_CCAPI_CCACHE_H_ */ diff --git a/src/ccapi/test/test_ccapi_check.c b/src/ccapi/test/test_ccapi_check.c index 12192a6..8352adf 100644 --- a/src/ccapi/test/test_ccapi_check.c +++ b/src/ccapi/test/test_ccapi_check.c @@ -34,4 +34,4 @@ int array_contains_int(cc_int32 *array, int size, cc_int32 value) { } } return 0; -} \ No newline at end of file +} diff --git a/src/ccapi/test/test_ccapi_constants.c b/src/ccapi/test/test_ccapi_constants.c index 5203fff..10d07f0 100644 --- a/src/ccapi/test/test_ccapi_constants.c +++ b/src/ccapi/test/test_ccapi_constants.c @@ -2,7 +2,7 @@ #include "test_ccapi_globals.h" #include "test_ccapi_check.h" -int check_constants() { +int check_constants(void) { BEGIN_TEST("constants"); /* API versions */ @@ -63,4 +63,4 @@ int check_constants() { check_int(cc_lock_block, 1); END_TEST_AND_RETURN -} \ No newline at end of file +} diff --git a/src/ccapi/test/test_ccapi_constants.h b/src/ccapi/test/test_ccapi_constants.h index ff6fd66..bc3f4f3 100644 --- a/src/ccapi/test/test_ccapi_constants.h +++ b/src/ccapi/test/test_ccapi_constants.h @@ -1,6 +1,6 @@ #ifndef _TEST_CCAPI_CONSTANTS_H_ #define _TEST_CCAPI_CONSTANTS_H_ -int check_constants(); +int check_constants(void); #endif /* _TEST_CCAPI_CONSTANTS_H_ */ diff --git a/src/ccapi/test/test_ccapi_iterators.c b/src/ccapi/test/test_ccapi_iterators.c index 42a4f97..74f4fca 100644 --- a/src/ccapi/test/test_ccapi_iterators.c +++ b/src/ccapi/test/test_ccapi_iterators.c @@ -245,4 +245,4 @@ cc_int32 check_once_cc_credentials_iterator_next(cc_credentials_iterator_t itera END_CHECK_ONCE; return err; -} \ No newline at end of file +} diff --git a/src/ccapi/test/test_ccapi_iterators.h b/src/ccapi/test/test_ccapi_iterators.h index d36affa..7308c7c 100644 --- a/src/ccapi/test/test_ccapi_iterators.h +++ b/src/ccapi/test/test_ccapi_iterators.h @@ -3,10 +3,10 @@ #include "test_ccapi_globals.h" -int check_cc_ccache_iterator_next(); +int check_cc_ccache_iterator_next(void); cc_int32 check_once_cc_ccache_iterator_next(cc_ccache_iterator_t iterator, cc_uint32 expected_count, cc_int32 expected_err, const char *description); -int check_cc_credentials_iterator_next(); +int check_cc_credentials_iterator_next(void); cc_int32 check_once_cc_credentials_iterator_next(cc_credentials_iterator_t iterator, cc_uint32 expected_count, cc_int32 expected_err, const char *description); #endif /* _TEST_CCAPI_ITERATORS_H_ */ diff --git a/src/ccapi/test/test_ccapi_log.c b/src/ccapi/test/test_ccapi_log.c index 95a467a..348d55c 100644 --- a/src/ccapi/test/test_ccapi_log.c +++ b/src/ccapi/test/test_ccapi_log.c @@ -7,7 +7,7 @@ void _log_error_v(const char *file, int line, const char *format, va_list ap) { fprintf(stdout, "\n\t%s:%d: ", file, line); if (!format) { - fprintf(stdout, "An unknown error occurred", file, line); + fprintf(stdout, "An unknown error occurred"); } else { vfprintf(stdout, format, ap); } diff --git a/src/ccapi/test/test_ccapi_util.c b/src/ccapi/test/test_ccapi_util.c index 282ec74..e2ad2b7 100644 --- a/src/ccapi/test/test_ccapi_util.c +++ b/src/ccapi/test/test_ccapi_util.c @@ -38,7 +38,7 @@ cc_int32 new_v5_creds_union (cc_credentials_union *out_union, const char *realm) cc_int32 err = ccNoError; cc_credentials_union *cred_union = NULL; cc_credentials_v5_t *v5creds = NULL; - static num_runs = 1; + static int num_runs = 1; char *client = NULL; char *server = NULL; @@ -138,4 +138,4 @@ int compare_v5_creds_unions(const cc_credentials_union *a, const cc_credentials_ } return retval; -} \ No newline at end of file +} -- cgit v1.1