Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_12)

* commit '7116d82f6b685261b5b4e64fada1a0a031cd7341':
  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

1 files changed, 3 insertions, 3 deletions

diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c
index f70ecd2..646373e 100644
--- a/tools/lib/h5tools.c
+++ b/tools/lib/h5tools.c
@@ -1828,10 +1828,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);
@@ -1844,7 +1844,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;
 }