diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-01-09 22:26:25 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-01-09 22:26:25 (GMT) |
| commit | a5789f6c9ab1f9308b5cc4dc64b156e9be077459 (patch) | |
| tree | 61f8f6ff6c6e1b6a85dc1d1535d9e7633705ac53 | |
| parent | 3e0c6530dc3a6008f800b25eb55c1422d853cc67 (diff) | |
| download | hdf5-a5789f6c9ab1f9308b5cc4dc64b156e9be077459.zip hdf5-a5789f6c9ab1f9308b5cc4dc64b156e9be077459.tar.gz hdf5-a5789f6c9ab1f9308b5cc4dc64b156e9be077459.tar.bz2 | |
HDFFV-8745 fix minor defects
| -rw-r--r-- | tools/lib/h5diff_attr.c | 2 | ||||
| -rw-r--r-- | tools/lib/h5diff_dset.c | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/tools/lib/h5diff_attr.c b/tools/lib/h5diff_attr.c index 4e4b40d..7f08cc7 100644 --- a/tools/lib/h5diff_attr.c +++ b/tools/lib/h5diff_attr.c @@ -325,8 +325,6 @@ hsize_t diff_attr(hid_t loc1_id, hid_t space2_id = -1; /* space ID */ hid_t ftype1_id = -1; /* file data type ID */ hid_t ftype2_id = -1; /* file data type ID */ - int vstrtype1 = 0; /* ftype1 is a variable string */ - int vstrtype2 = 0; /* ftype2 is a variable string */ hid_t mtype1_id = -1; /* memory data type ID */ hid_t mtype2_id = -1; /* memory data type ID */ size_t msize1; /* memory size of memory type */ 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; |