diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-01-11 15:09:18 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-01-11 15:09:18 (GMT) |
| commit | f18d8a68bf44ee05d2c97914751265d531827d21 (patch) | |
| tree | 71d3c29ccd3abd5ee03ce3d57daf5c7836726224 /tools/lib/h5diff_dset.c | |
| parent | 88574bf85618adc96142bebf865ac2caf82c8f09 (diff) | |
| parent | c7e8a0788c68c2fe05b6b70591a499ad277c8fa5 (diff) | |
| download | hdf5-f18d8a68bf44ee05d2c97914751265d531827d21.zip hdf5-f18d8a68bf44ee05d2c97914751265d531827d21.tar.gz hdf5-f18d8a68bf44ee05d2c97914751265d531827d21.tar.bz2 | |
Merge pull request #855 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'c7e8a0788c68c2fe05b6b70591a499ad277c8fa5':
Correct whitespace
HDFFV-10385 multi-config builders need folder set
HDFFV-10385 fix packaging
Fix typo
HDFFV-8745 remove obsolete files
HDFFV-10385 includes cleanup
HDFFV-10385 - add release note
HDFFV-10385 fix fortran references
Correct folder typo
HDFFV-8745 fix minor defects
HDFFV-10385 fix platform errors
HDFFV-10385 refactor CMAKE_BUILD_TYPE usage
Diffstat (limited to 'tools/lib/h5diff_dset.c')
| -rw-r--r-- | tools/lib/h5diff_dset.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/lib/h5diff_dset.c b/tools/lib/h5diff_dset.c index 86aa543..ff542db 100644 --- a/tools/lib/h5diff_dset.c +++ b/tools/lib/h5diff_dset.c @@ -773,8 +773,8 @@ int diff_can_type(hid_t f_tid1, /* file data type */ } if(tclass1 == H5T_STRING) { - hid_t vstrtype1 = -1; - hid_t vstrtype2 = -1; + htri_t vstrtype1 = -1; + htri_t vstrtype2 = -1; h5difftrace("diff_can_type end - H5T_STRING\n"); vstrtype1 = H5Tis_variable_str(f_tid1); @@ -782,7 +782,7 @@ int diff_can_type(hid_t f_tid1, /* file data type */ /* no compare if either one but not both are variable string type */ if (vstrtype1 != vstrtype2) { - if((opts->m_verbose || opts->m_list_not_cmp)) + if((opts->m_verbose || opts->m_list_not_cmp) && obj1_name && obj2_name) parallel_print("Not comparable: <%s> or <%s> is of mixed string type\n", obj1_name, obj2_name); opts->not_cmp = 1; |