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

4 files changed, 12 insertions, 6 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;
 }
diff --git a/tools/src/h5dump/h5dump_xml.c b/tools/src/h5dump/h5dump_xml.c
index b78cf00..b63e68d 100644
--- a/tools/src/h5dump/h5dump_xml.c
+++ b/tools/src/h5dump/h5dump_xml.c
@@ -610,7 +610,7 @@ xml_name_to_XID(const char *str , char *outstr, int outlen, int gen)
 
     HDsprintf(outstr, "xid_"H5_PRINTF_HADDR_FMT, objno);
 
-    return(0);
+    return 0;
 }
 
 static const char      *quote = """;
diff --git a/tools/src/h5stat/h5stat.c b/tools/src/h5stat/h5stat.c
index 64053a8..588c2f3 100644
--- a/tools/src/h5stat/h5stat.c
+++ b/tools/src/h5stat/h5stat.c
@@ -399,7 +399,7 @@ attribute_stats(iter_t *iter, const H5O_info_t *oi)
         iter->attr_bins = (unsigned long *)HDrealloc(iter->attr_bins, (bin + 1) * sizeof(unsigned long));
         HDassert(iter->attr_bins);
 
-  /* Initialize counts for intermediate bins */
+        /* Initialize counts for intermediate bins */
         while(iter->attr_nbins < bin)
             iter->attr_bins[iter->attr_nbins++] = 0;
         iter->attr_nbins++;
diff --git a/tools/src/misc/h5debug.c b/tools/src/misc/h5debug.c
index b28457e..a167709 100644
--- a/tools/src/misc/h5debug.c
+++ b/tools/src/misc/h5debug.c
@@ -249,6 +249,7 @@ int
 main(int argc, char *argv[])
 {
     hid_t  fid, fapl;
+    H5VL_object_t *vol_obj;
     H5F_t       *f;
     haddr_t     addr = 0, extra = 0, extra2 = 0, extra3 = 0, extra4 = 0;
     uint8_t     sig[H5F_SIGNATURE_LEN];
@@ -297,7 +298,12 @@ main(int argc, char *argv[])
     }
     api_ctx_pushed = TRUE;
 
-    if(NULL == (f = (H5F_t *)H5I_object(fid))) {
+    if(NULL == (vol_obj = (H5VL_object_t *)H5VL_vol_object(fid))) {
+        HDfprintf(stderr, "cannot obtain vol_obj pointer\n");
+        HDexit(2);
+    } /* end if */
+
+    if(NULL == (f = (H5F_t *)H5VL_object_data(vol_obj))) {
         HDfprintf(stderr, "cannot obtain H5F_t pointer\n");
         HDexit(2);
     } /* end if */