diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-01-12 15:16:56 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-01-12 15:16:56 (GMT) |
| commit | f2bf0d60a25f4a88d1a26bd95e268adec05eba3c (patch) | |
| tree | 582fb5653c4b50f8ee2eafca0b6365549284ed13 /tools/lib | |
| parent | 7e8d2c982199c03dc5aa4fd95dd7d44b83d84f65 (diff) | |
| parent | d92575889bc5a509ba2ac428c2086855edd26b32 (diff) | |
| download | hdf5-f2bf0d60a25f4a88d1a26bd95e268adec05eba3c.zip hdf5-f2bf0d60a25f4a88d1a26bd95e268adec05eba3c.tar.gz hdf5-f2bf0d60a25f4a88d1a26bd95e268adec05eba3c.tar.bz2 | |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_8)
* commit 'd92575889bc5a509ba2ac428c2086855edd26b32':
fix merge error
Merge pull request #2244 in HDFFV/hdf5 from ~KMU/hdf5:bugfix/intel_warnings to develop
Merge pull request #2071 in HDFFV/hdf5 from ~KMU/hdf5:bugfix/intel_warnings to develop
Merge pull request #2234 in HDFFV/hdf5 from ~KMU/hdf5:bugfix/intel_warnings to develop
Diffstat (limited to 'tools/lib')
| -rw-r--r-- | tools/lib/h5diff.c | 2 | ||||
| -rw-r--r-- | tools/lib/h5diff_attr.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c index c028c4e..6569778 100644 --- a/tools/lib/h5diff.c +++ b/tools/lib/h5diff.c @@ -907,7 +907,7 @@ h5diff(const char *fname1, parallel_print("file1 file2\n"); parallel_print("---------------------------------------\n"); for(u = 0; u < match_list->nobjs; u++) { - char c1, c2; + int c1, c2; c1 = (match_list->objs[u].flags[0]) ? 'x' : ' '; c2 = (match_list->objs[u].flags[1]) ? 'x' : ' '; parallel_print("%5c %6c %-15s\n", c1, c2, match_list->objs[u].name); diff --git a/tools/lib/h5diff_attr.c b/tools/lib/h5diff_attr.c index 7f08cc7..a526aa4 100644 --- a/tools/lib/h5diff_attr.c +++ b/tools/lib/h5diff_attr.c @@ -273,7 +273,7 @@ static herr_t build_match_list_attrs(hid_t loc1_id, hid_t loc2_id, table_attrs_t parallel_print(" obj1 obj2\n"); parallel_print(" --------------------------------------\n"); for(i = 0; i < (unsigned int) table_lp->nattrs; i++) { - char c1, c2; + int c1, c2; c1 = (table_lp->attrs[i].exist[0]) ? 'x' : ' '; c2 = (table_lp->attrs[i].exist[1]) ? 'x' : ' '; parallel_print("%5c %6c %-15s\n", c1, c2, table_lp->attrs[i].name); |