diff options
| author | kmu <kmu@hdfgroup.org> | 2020-01-21 02:47:48 (GMT) |
|---|---|---|
| committer | kmu <kmu@hdfgroup.org> | 2020-01-21 02:47:48 (GMT) |
| commit | a95b5b1e056e171702ad41b69cb796da0cbb91eb (patch) | |
| tree | efeac251757e78e1fcef89356e7c56f240279d45 /tools/lib/h5diff_attr.c | |
| parent | 7e93acd94f20c73d27bb2eb4f7b4389d88cfb299 (diff) | |
| parent | a63f22e27cad74c9bb98ca2b4d2a5fd118ef3571 (diff) | |
| download | hdf5-a95b5b1e056e171702ad41b69cb796da0cbb91eb.zip hdf5-a95b5b1e056e171702ad41b69cb796da0cbb91eb.tar.gz hdf5-a95b5b1e056e171702ad41b69cb796da0cbb91eb.tar.bz2 | |
Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into develop
Diffstat (limited to 'tools/lib/h5diff_attr.c')
| -rw-r--r-- | tools/lib/h5diff_attr.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tools/lib/h5diff_attr.c b/tools/lib/h5diff_attr.c index e92e141..d1b4697 100644 --- a/tools/lib/h5diff_attr.c +++ b/tools/lib/h5diff_attr.c @@ -140,7 +140,7 @@ static void table_attr_mark_exist(unsigned *exist, char *name, table_attrs_t *ta static herr_t build_match_list_attrs(hid_t loc1_id, hid_t loc2_id, table_attrs_t ** table_out, diff_opt_t *opts) { table_attrs_t *table_lp = NULL; - H5O_info_t oinfo1, oinfo2; /* Object info */ + H5O_info2_t oinfo1, oinfo2; /* Object info */ hid_t attr1_id = H5I_INVALID_HID; /* attr ID */ hid_t attr2_id = H5I_INVALID_HID; /* attr ID */ size_t curr1 = 0; @@ -155,14 +155,14 @@ static herr_t build_match_list_attrs(hid_t loc1_id, hid_t loc2_id, table_attrs_t H5TOOLS_DEBUG("build_match_list_attrs start - errstat:%d", opts->err_stat); - if(H5Oget_info2(loc1_id, &oinfo1, H5O_INFO_NUM_ATTRS) < 0) { + if(H5Oget_info3(loc1_id, &oinfo1, H5O_INFO_NUM_ATTRS) < 0) { H5TOOLS_GOTO_ERROR(FAIL, "H5Oget_info first object failed"); } - H5TOOLS_DEBUG("H5Oget_info2 loc1id=%d", oinfo1.num_attrs); - if(H5Oget_info2(loc2_id, &oinfo2, H5O_INFO_NUM_ATTRS) < 0) { + H5TOOLS_DEBUG("H5Oget_info3 loc1id=%d", oinfo1.num_attrs); + if(H5Oget_info3(loc2_id, &oinfo2, H5O_INFO_NUM_ATTRS) < 0) { H5TOOLS_GOTO_ERROR(FAIL, "H5Oget_info second object failed"); } - H5TOOLS_DEBUG("H5Oget_info2 loc2id=%d", oinfo2.num_attrs); + H5TOOLS_DEBUG("H5Oget_info3 loc2id=%d", oinfo2.num_attrs); table_attrs_init(&table_lp); if (table_lp == NULL) @@ -336,7 +336,6 @@ hsize_t diff_attr_data(hid_t attr1_id, hid_t attr2_id, const char *name1, const hsize_t dims2[H5S_MAX_RANK]; /* dimensions of dataset */ char np1[512]; char np2[512]; - unsigned u; /* Local index variable */ hsize_t nfound = 0; int j; diff_err_t ret_value = opts->err_stat; |