diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2013-09-26 22:10:54 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2013-09-26 22:10:54 (GMT) |
| commit | deddc7f9558d76a4cebc417af8d426877d5aee7d (patch) | |
| tree | e2e43dea685c798debbbe6ae14f7297738c0bfbd /tools/lib/h5diff.c | |
| parent | e2dfb53df72ca884cb9225e738aef77135f92e68 (diff) | |
| download | hdf5-deddc7f9558d76a4cebc417af8d426877d5aee7d.zip hdf5-deddc7f9558d76a4cebc417af8d426877d5aee7d.tar.gz hdf5-deddc7f9558d76a4cebc417af8d426877d5aee7d.tar.bz2 | |
[svn-r24205] Merge HDFFV-8513/8522 from trunk (via cmake branch), h5repack UD plugins.
Also warning session fixes.
Tested: CMake local linux
Diffstat (limited to 'tools/lib/h5diff.c')
| -rw-r--r-- | tools/lib/h5diff.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c index a9f2433..73bbd07 100644 --- a/tools/lib/h5diff.c +++ b/tools/lib/h5diff.c @@ -832,10 +832,10 @@ hsize_t h5diff(const char *fname1, else { /* set root group */ - obj1fullname = (char*)HDcalloc(2, sizeof(char)); + obj1fullname = (char*)HDcalloc((size_t)2, sizeof(char)); HDstrcat(obj1fullname, "/"); obj1type = H5TRAV_TYPE_GROUP; - obj2fullname = (char*)HDcalloc(2, sizeof(char)); + obj2fullname = (char*)HDcalloc((size_t)2, sizeof(char)); HDstrcat(obj2fullname, "/"); obj2type = H5TRAV_TYPE_GROUP; } @@ -1531,13 +1531,12 @@ hsize_t diff(hid_t file1_id, hid_t grp1_id = (-1); hid_t grp2_id = (-1); int ret; - int is_dangle_link1 = 0; - int is_dangle_link2 = 0; - int is_hard_link = 0; + hbool_t is_dangle_link1 = FALSE; + hbool_t is_dangle_link2 = FALSE; + hbool_t is_hard_link = FALSE; hsize_t nfound = 0; h5trav_type_t object_type; - /* to get link info */ h5tool_link_info_t linkinfo1; h5tool_link_info_t linkinfo2; @@ -1574,7 +1573,7 @@ hsize_t diff(hid_t file1_id, goto out; } else - is_dangle_link1 = 1; + is_dangle_link1 = TRUE; } else if (ret < 0) goto out; @@ -1592,7 +1591,7 @@ hsize_t diff(hid_t file1_id, goto out; } else - is_dangle_link2 = 1; + is_dangle_link2 = TRUE; } else if (ret < 0) goto out; |