diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.in | 1 | ||||
| -rw-r--r-- | test/chunk.c | 10 | ||||
| -rw-r--r-- | test/dsets.c | 6 | ||||
| -rw-r--r-- | test/dtypes.c | 6 | ||||
| -rw-r--r-- | test/h5test.c | 2 | ||||
| -rw-r--r-- | test/h5test.h | 2 | ||||
| -rw-r--r-- | test/overhead.c | 6 | ||||
| -rw-r--r-- | test/ragged.c | 4 | ||||
| -rw-r--r-- | test/tattr.c | 2 |
9 files changed, 20 insertions, 19 deletions
diff --git a/test/Makefile.in b/test/Makefile.in index c8d880b..99b201b 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -30,6 +30,7 @@ LIBHDF5=../src/libhdf5.la LIB=libh5test.a LIB_SRC=h5test.c LIB_OBJ=$(LIB_SRC:.c=.o) +PUB_LIB= # Temporary files. These files are the ones created by setting the # HDF5_NOCLEANUP environment variable and running `make test' without diff --git a/test/chunk.c b/test/chunk.c index 5a00535..738dd21 100644 --- a/test/chunk.c +++ b/test/chunk.c @@ -25,9 +25,9 @@ #ifndef HAVE_ATTRIBUTE # undef __attribute__ # define __attribute__(X) /*void*/ -# define __unused__ /*void*/ +# define UNUSED /*void*/ #else -# define __unused__ __attribute__((unused)) +# define UNUSED __attribute__((unused)) #endif #define FILE_NAME "chunk.h5" @@ -82,9 +82,9 @@ static hid_t fapl_g = -1; *------------------------------------------------------------------------- */ static size_t -counter (unsigned __unused__ flags, size_t __unused__ cd_nelmts, - const unsigned __unused__ *cd_values, size_t nbytes, - size_t __unused__ *buf_size, void __unused__ **buf) +counter (unsigned UNUSED flags, size_t UNUSED cd_nelmts, + const unsigned UNUSED *cd_values, size_t nbytes, + size_t UNUSED *buf_size, void UNUSED **buf) { nio_g += nbytes; return nbytes; diff --git a/test/dsets.c b/test/dsets.c index 4b221b2..a9cf40e 100644 --- a/test/dsets.c +++ b/test/dsets.c @@ -313,9 +313,9 @@ test_tconv(hid_t file) *------------------------------------------------------------------------- */ static size_t -bogus(unsigned int __unused__ flags, size_t __unused__ cd_nelmts, - const unsigned int __unused__ cd_values[], size_t nbytes, - size_t __unused__ *buf_size, void __unused__ **buf) +bogus(unsigned int UNUSED flags, size_t UNUSED cd_nelmts, + const unsigned int UNUSED cd_values[], size_t nbytes, + size_t UNUSED *buf_size, void UNUSED **buf) { return nbytes; } diff --git a/test/dtypes.c b/test/dtypes.c index 04e5737..0e164c7 100644 --- a/test/dtypes.c +++ b/test/dtypes.c @@ -109,7 +109,7 @@ void some_dummy_func(float x); *------------------------------------------------------------------------- */ static void -fpe_handler(int __unused__ signo) +fpe_handler(int UNUSED signo) { SKIPPED(); puts(" Test skipped due to SIGFPE."); @@ -139,8 +139,8 @@ fpe_handler(int __unused__ signo) */ #ifdef SHOW_OVERFLOWS static herr_t -overflow_handler(hid_t __unused__ src_id, hid_t __unused__ dst_id, - void __unused__ *src_buf, void __unused__ *dst_buf) +overflow_handler(hid_t UNUSED src_id, hid_t UNUSED dst_id, + void UNUSED *src_buf, void UNUSED *dst_buf) { noverflows_g++; return -1; diff --git a/test/h5test.c b/test/h5test.c index 59ac0b8..861b0f0 100644 --- a/test/h5test.c +++ b/test/h5test.c @@ -51,7 +51,7 @@ *------------------------------------------------------------------------- */ herr_t -h5_errors(void __unused__ *client_data) +h5_errors(void UNUSED *client_data) { FAILED(); H5Eprint (stdout); diff --git a/test/h5test.h b/test/h5test.h index fc26f2f..a5b81da 100644 --- a/test/h5test.h +++ b/test/h5test.h @@ -55,7 +55,7 @@ extern "C" { #endif int h5_cleanup(hid_t fapl); -herr_t h5_errors(void __unused__ *client_data); +herr_t h5_errors(void *client_data); char *h5_fixname(const char *basename, hid_t fapl, char *fullname, size_t size); hid_t h5_fileaccess(void); diff --git a/test/overhead.c b/test/overhead.c index 4656fa5..2852064 100644 --- a/test/overhead.c +++ b/test/overhead.c @@ -36,9 +36,9 @@ #ifndef HAVE_ATTRIBUTE # undef __attribute__ # define __attribute__(X) /*void*/ -# define __unused__ /*void*/ +# define UNUSED /*void*/ #else -# define __unused__ __attribute__((unused)) +# define UNUSED __attribute__((unused)) #endif #define FILE_NAME_1 "overhead.h5" @@ -146,7 +146,7 @@ cleanup (void) *------------------------------------------------------------------------- */ static herr_t -display_error_cb (void __unused__ *client_data) +display_error_cb (void UNUSED *client_data) { puts ("*FAILED*"); H5Eprint (stdout); diff --git a/test/ragged.c b/test/ragged.c index 6b75dab..b40e3b1 100644 --- a/test/ragged.c +++ b/test/ragged.c @@ -80,7 +80,7 @@ static volatile sig_atomic_t timeout_g = 0; *------------------------------------------------------------------------- */ static void -catch_alarm(int __unused__ signum) +catch_alarm(int UNUSED signum) { static int ncalls=0; @@ -110,7 +110,7 @@ catch_alarm(int __unused__ signum) *------------------------------------------------------------------------- */ static herr_t -display_error_cb (void __unused__ *client_data) +display_error_cb (void UNUSED *client_data) { putchar('\n'); H5Eprint (stdout); diff --git a/test/tattr.c b/test/tattr.c index c548974..371ff7c 100644 --- a/test/tattr.c +++ b/test/tattr.c @@ -1003,7 +1003,7 @@ test_attr_mult_read(void) ** attr_op1(): Attribute operator ** ****************************************************************/ -int attr_op1(hid_t __unused__ loc_id, const char *name, void *op_data) +int attr_op1(hid_t UNUSED loc_id, const char *name, void *op_data) { int *count=(int *)op_data; int ret=0; |