diff options
| author | David Young <dyoung@hdfgroup.org> | 2020-04-27 15:07:36 (GMT) |
|---|---|---|
| committer | David Young <dyoung@hdfgroup.org> | 2020-07-07 15:49:55 (GMT) |
| commit | 9159b93da623e5fdd95236322d79d003cce14c61 (patch) | |
| tree | ff1dcc752b8b42dd06acd9f027b29b132a4149f2 /test/ros3.c | |
| parent | 345443f9ad239297e6dadbbf2153c12cbed2410e (diff) | |
| download | hdf5-9159b93da623e5fdd95236322d79d003cce14c61.zip hdf5-9159b93da623e5fdd95236322d79d003cce14c61.tar.gz hdf5-9159b93da623e5fdd95236322d79d003cce14c61.tar.bz2 | |
Fix code that made GCC complain about a NULL or `unsigned char *` arguments for
"%s".
XXX The duplication between test/ros3.c test/s3comms.c is really annoying.
Diffstat (limited to 'test/ros3.c')
| -rw-r--r-- | test/ros3.c | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/test/ros3.c b/test/ros3.c index 73b6ac2..6618194 100644 --- a/test/ros3.c +++ b/test/ros3.c @@ -197,14 +197,19 @@ if (!(condition)) { \ * *---------------------------------------------------------------------------- */ +static inline void +jserr_long(long expected, long actual, const char *reason) +{ + if (reason != NULL) { + HDprintf("%s\n", reason); + } else { + HDprintf(" ! Expected %ld\n ! Actual %ld\n", expected, actual); + } +} + #define JSERR_LONG(expected, actual, reason) { \ JSFAILED_AT() \ - if (reason!= NULL) { \ - HDprintf("%s\n", (reason)); \ - } else { \ - HDprintf(" ! Expected %ld\n ! Actual %ld\n", \ - (long)(expected), (long)(actual)); \ - } \ + jserr_long((long)(expected), (long)(actual), (reason)); \ } @@ -236,18 +241,21 @@ if (!(condition)) { \ * *---------------------------------------------------------------------------- */ +static inline void +jserr_str(const char *expected, const char *actual, const char *reason) +{ + if (reason != NULL) { + HDprintf("%s\n", reason); + } else { + HDprintf("!!! Expected:\n%s\n!!!Actual:\n%s\n", expected, actual); + } +} + #define JSERR_STR(expected, actual, reason) { \ JSFAILED_AT() \ - if ((reason) != NULL) { \ - HDprintf("%s\n", (reason)); \ - } else { \ - HDprintf("!!! Expected:\n%s\n!!!Actual:\n%s\n", \ - (expected), (actual)); \ - } \ + jserr_str((expected), (actual), (reason)); \ } - - #ifdef JSVERIFY_EXP_ACT @@ -1594,7 +1602,8 @@ test_cmp(void) fapl_id = H5Pcreate(H5P_FILE_ACCESS); FAIL_IF( 0 > fapl_id ) - JSVERIFY( SUCCEED, H5Pset_fapl_ros3(fapl_id, &restricted_access_fa), NULL ) + JSVERIFY( SUCCEED, H5Pset_fapl_ros3(fapl_id, &restricted_access_fa), + NULL ) fd_raven = H5FDopen( url_text_public, |