diff options
author | Quincey Koziol <koziol@lbl.gov> | 2020-01-07 16:17:24 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@lbl.gov> | 2020-01-07 16:17:24 (GMT) |
commit | 7116d82f6b685261b5b4e64fada1a0a031cd7341 (patch) | |
tree | 3f93a79725006a12f227fa88090b3729d3a45f45 /tools/lib | |
parent | a08a3eaebac031a909748db05f747cec72989f5c (diff) | |
parent | fcdcc4beb18cfb6098ec2f0e0d45db38ee59178f (diff) | |
download | hdf5-7116d82f6b685261b5b4e64fada1a0a031cd7341.zip hdf5-7116d82f6b685261b5b4e64fada1a0a031cd7341.tar.gz hdf5-7116d82f6b685261b5b4e64fada1a0a031cd7341.tar.bz2 |
Merge pull request #2229 in HDFFV/hdf5 from vol_changes_to_1_12 to hdf5_1_12
* commit 'fcdcc4beb18cfb6098ec2f0e0d45db38ee59178f':
Remove mismerged code
Cherry pick of 0225e6d5969
Cleanups from PR reviews
Remove unnecessary H5CX call
Refactor H5Dvlen_get_buf_size to use optional dataset operation, with generic fallback for VOL connectors that don't implement operation
Refactor all the 'H5VL_*_optional' callbacks to move the type of operation out of the va_list, so it's at least possible for another connector to know what the operation is and decide whether to implement it or not.
Update h5debug to retrieve file pointer through VOL framework
Diffstat (limited to 'tools/lib')
-rw-r--r-- | tools/lib/h5tools.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c index 727e493..d015e1c 100644 --- a/tools/lib/h5tools.c +++ b/tools/lib/h5tools.c @@ -1816,10 +1816,10 @@ h5tools_is_zero(const void *_mem, size_t size) */ hbool_t h5tools_is_obj_same(hid_t loc_id1, const char *name1, - hid_t loc_id2, const char *name2) + hid_t loc_id2, const char *name2) { H5O_info_t oinfo1, oinfo2; - hbool_t ret_val = 0; + hbool_t ret_val = FALSE; if ( name1 && HDstrcmp(name1, ".")) H5Oget_info_by_name2(loc_id1, name1, &oinfo1, H5O_INFO_BASIC, H5P_DEFAULT); @@ -1832,7 +1832,7 @@ h5tools_is_obj_same(hid_t loc_id1, const char *name1, H5Oget_info2(loc_id2, &oinfo2, H5O_INFO_BASIC); if (oinfo1.fileno == oinfo2.fileno && oinfo1.addr==oinfo2.addr) - ret_val = 1; + ret_val = TRUE; return ret_val; } |