summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2004-07-01 13:14:59 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2004-07-01 13:14:59 (GMT)
commit7afa78d822ea6bfbe254d63c66b3ef32e647fca0 (patch)
tree736b86390619d6ba5cfc1932a62ca5e400226c73
parentb0adb1c3bf674e95681badfe17ab56e7a13f0aad (diff)
downloadhdf5-7afa78d822ea6bfbe254d63c66b3ef32e647fca0.zip
hdf5-7afa78d822ea6bfbe254d63c66b3ef32e647fca0.tar.gz
hdf5-7afa78d822ea6bfbe254d63c66b3ef32e647fca0.tar.bz2
[svn-r8778] Purpose:
Bug fix Description: Correct use of H5Eprint() when 1.6 compatibility is turned on. Platforms tested: FreeBSD 4.10 (sleipnir) w/compatibility h5committest doesn't test this, so it wasn't run.
-rw-r--r--test/filename.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/test/filename.c b/test/filename.c
index 992ae0d..9a4af54 100644
--- a/test/filename.c
+++ b/test/filename.c
@@ -41,6 +41,20 @@ typedef struct s1_t {
} s1_t;
/* Used to make certain a return name _is_ the file name */
+#ifdef H5_WANT_H5_V1_6_COMPAT
+#define VERIFY_NAME(x, val, where) do { \
+ if (GetTestVerbosity()>=VERBO_HI) { \
+ print_func(" Call to routine: %15s at line %4d in %s had value " \
+ "%ld \n", (where), (int)__LINE__, __FILE__, (long)(x)); \
+ } \
+ if (strcmp(x, val)) { \
+ TestErrPrintf("*** UNEXPECTED VALUE from %s should be %s, but is %s at line %4d " \
+ "in %s\n", where, val, x, (int)__LINE__, __FILE__); \
+ H5Eprint (stdout); \
+ } \
+ HDstrcmp(x, ""); \
+} while(0)
+#else /* H5_WANT_H5_V1_6_COMPAT */
#define VERIFY_NAME(x, val, where) do { \
if (GetTestVerbosity()>=VERBO_HI) { \
print_func(" Call to routine: %15s at line %4d in %s had value " \
@@ -51,8 +65,9 @@ typedef struct s1_t {
"in %s\n", where, val, x, (int)__LINE__, __FILE__); \
H5Eprint (H5E_DEFAULT, stdout); \
} \
- strcmp(x, ""); \
+ HDstrcmp(x, ""); \
} while(0)
+#endif /* H5_WANT_H5_V1_6_COMPAT */
int main( void )
{