diff options
| author | Quincey Koziol <koziol@koziol.gov> | 2019-06-21 15:05:34 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@koziol.gov> | 2019-06-21 15:05:34 (GMT) |
| commit | 1ccbdfee589d9f56d71983506313879fa47c4e90 (patch) | |
| tree | c1d64e0d77828bcf81dd0e4e4b4e9fda41911582 /tools/lib | |
| parent | 5fc5d947f084d1ef5d4c4a0bc2be55baa181f0fa (diff) | |
| download | hdf5-1ccbdfee589d9f56d71983506313879fa47c4e90.zip hdf5-1ccbdfee589d9f56d71983506313879fa47c4e90.tar.gz hdf5-1ccbdfee589d9f56d71983506313879fa47c4e90.tar.bz2 | |
Add support for GCC 7.x warnings, update warnhist script to account for them,
clean up warnings.
Diffstat (limited to 'tools/lib')
| -rw-r--r-- | tools/lib/h5diff.c | 1 | ||||
| -rw-r--r-- | tools/lib/h5diff_array.c | 11 |
2 files changed, 5 insertions, 7 deletions
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c index 594bf51..3ee5393 100644 --- a/tools/lib/h5diff.c +++ b/tools/lib/h5diff.c @@ -1344,7 +1344,6 @@ diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1, } #endif /* H5_HAVE_PARALLEL */ -out: opts->err_stat = opts->err_stat | ret_value; /* free table */ diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c index 9d5f062..0169131 100644 --- a/tools/lib/h5diff_array.c +++ b/tools/lib/h5diff_array.c @@ -783,12 +783,11 @@ static hsize_t diff_datum( } /* check object type */ - if (ret_value >= 0) - if (obj1_type != obj2_type) { - parallel_print("Different object types referenced: <%s> and <%s>", obj1, obj2); - opts->not_cmp = 1; - HGOTO_DONE (opts->err_stat); - } + if (obj1_type != obj2_type) { + parallel_print("Different object types referenced: <%s> and <%s>", obj1, obj2); + opts->not_cmp = 1; + HGOTO_DONE (opts->err_stat); + } if ((obj1_id = H5Rdereference2(container1_id, H5P_DEFAULT, H5R_OBJECT, _mem1)) < 0) { opts->err_stat = 1; |