Source formatted

1 files changed, 163 insertions, 201 deletions

diff --git a/src/H5M.c b/src/H5M.c
index 0866bb7..34d0105 100644
--- a/src/H5M.c
+++ b/src/H5M.c
@@ -15,38 +15,32 @@
 /* Module Setup */
 /****************/
 
-#include "H5Mmodule.h"          /* This source code file is part of the H5M module */
-
+#include "H5Mmodule.h" /* This source code file is part of the H5M module */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"          /* Generic Functions                        */
-#include "H5CXprivate.h"        /* API Contexts                             */
-#include "H5Mpkg.h"             /* Maps                                     */
-#include "H5Eprivate.h"         /* Error handling                           */
-#include "H5Iprivate.h"         /* IDs                                      */
-#include "H5VLprivate.h"        /* Virtual Object Layer                     */
-
-
+#include "H5private.h"   /* Generic Functions                        */
+#include "H5CXprivate.h" /* API Contexts                             */
+#include "H5Mpkg.h"      /* Maps                                     */
+#include "H5Eprivate.h"  /* Error handling                           */
+#include "H5Iprivate.h"  /* IDs                                      */
+#include "H5VLprivate.h" /* Virtual Object Layer                     */
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
 static herr_t H5M__close_cb(H5VL_object_t *map_vol_obj);
 
-
 /*********************/
 /* Package Variables */
 /*********************/
@@ -54,29 +48,25 @@ static herr_t H5M__close_cb(H5VL_object_t *map_vol_obj);
 /* Package initialization variable */
 hbool_t H5_PKG_INIT_VAR = FALSE;
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
 /* Map ID class */
 static const H5I_class_t H5I_MAP_CLS[1] = {{
-    H5I_MAP,                    /* ID class value */
-    0,                          /* Class flags */
-    0,                          /* # of reserved IDs for class */
-    (H5I_free_t)H5M__close_cb   /* Callback routine for closing objects of this class */
+    H5I_MAP,                  /* ID class value */
+    0,                        /* Class flags */
+    0,                        /* # of reserved IDs for class */
+    (H5I_free_t)H5M__close_cb /* Callback routine for closing objects of this class */
 }};
 
 /* Flag indicating "top" of interface has been initialized */
 static hbool_t H5M_top_package_initialize_s = FALSE;
 
-
-
 /*-------------------------------------------------------------------------
  * Function: H5M_init
  *
@@ -90,7 +80,7 @@ static hbool_t H5M_top_package_initialize_s = FALSE;
 herr_t
 H5M_init(void)
 {
-    herr_t ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
     /* FUNC_ENTER() does all the work */
@@ -99,7 +89,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5M_init() */
 
-
 /*-------------------------------------------------------------------------
 NAME
     H5M__init_package -- Initialize interface-specific information
@@ -115,12 +104,12 @@ DESCRIPTION
 herr_t
 H5M__init_package(void)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
     /* Initialize the atom group for the map IDs */
-    if(H5I_register_type(H5I_MAP_CLS) < 0)
+    if (H5I_register_type(H5I_MAP_CLS) < 0)
         HGOTO_ERROR(H5E_MAP, H5E_CANTINIT, FAIL, "unable to initialize interface")
 
     /* Mark "top" of interface as initialized, too */
@@ -130,7 +119,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5M__init_package() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5M_top_term_package
  *
@@ -144,25 +132,24 @@ done:
 int
 H5M_top_term_package(void)
 {
-    int    n = 0;
+    int n = 0;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(H5M_top_package_initialize_s) {
-        if(H5I_nmembers(H5I_MAP) > 0) {
+    if (H5M_top_package_initialize_s) {
+        if (H5I_nmembers(H5I_MAP) > 0) {
             (void)H5I_clear_type(H5I_MAP, FALSE, FALSE);
             n++; /*H5I*/
-        } /* end if */
+        }        /* end if */
 
         /* Mark closed */
-        if(0 == n)
+        if (0 == n)
             H5M_top_package_initialize_s = FALSE;
     } /* end if */
 
     FUNC_LEAVE_NOAPI(n)
 } /* end H5M_top_term_package() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5M_term_package
  *
@@ -179,11 +166,11 @@ H5M_top_term_package(void)
 int
 H5M_term_package(void)
 {
-    int    n = 0;
+    int n = 0;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(H5_PKG_INIT_VAR) {
+    if (H5_PKG_INIT_VAR) {
         /* Sanity checks */
         HDassert(0 == H5I_nmembers(H5I_MAP));
         HDassert(FALSE == H5M_top_package_initialize_s);
@@ -192,14 +179,13 @@ H5M_term_package(void)
         n += (H5I_dec_type_ref(H5I_MAP) > 0);
 
         /* Mark closed */
-        if(0 == n)
+        if (0 == n)
             H5_PKG_INIT_VAR = FALSE;
     } /* end if */
 
     FUNC_LEAVE_NOAPI(n)
 } /* end H5M_term_package() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5M__close_cb
  *
@@ -212,7 +198,7 @@ H5M_term_package(void)
 static herr_t
 H5M__close_cb(H5VL_object_t *map_vol_obj)
 {
-    herr_t              ret_value = SUCCEED;    /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -220,11 +206,11 @@ H5M__close_cb(H5VL_object_t *map_vol_obj)
     HDassert(map_vol_obj);
 
     /* Close the map */
-    if(H5VL_optional(map_vol_obj, H5VL_MAP_CLOSE, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL) < 0)
+    if (H5VL_optional(map_vol_obj, H5VL_MAP_CLOSE, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL) < 0)
         HGOTO_ERROR(H5E_MAP, H5E_CLOSEERROR, FAIL, "unable to close map");
 
     /* Free the VOL object */
-    if(H5VL_free_object(map_vol_obj) < 0)
+    if (H5VL_free_object(map_vol_obj) < 0)
         HGOTO_ERROR(H5E_MAP, H5E_CANTDEC, FAIL, "unable to free VOL object");
 
 done:
@@ -233,7 +219,6 @@ done:
 
 #ifdef H5_HAVE_MAP_API
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Mcreate
  *
@@ -252,69 +237,65 @@ done:
  *-------------------------------------------------------------------------
  */
 hid_t
-H5Mcreate(hid_t loc_id, const char *name, hid_t key_type_id, hid_t val_type_id,
-    hid_t lcpl_id, hid_t mcpl_id, hid_t mapl_id)
+H5Mcreate(hid_t loc_id, const char *name, hid_t key_type_id, hid_t val_type_id, hid_t lcpl_id, hid_t mcpl_id,
+          hid_t mapl_id)
 {
-    void               *map = NULL;                         /* New map's info */
-    H5VL_object_t      *vol_obj = NULL;                     /* object of loc_id */
-    H5VL_loc_params_t   loc_params;
-    hid_t               ret_value = H5I_INVALID_HID;        /* Return value */
+    void *            map     = NULL; /* New map's info */
+    H5VL_object_t *   vol_obj = NULL; /* object of loc_id */
+    H5VL_loc_params_t loc_params;
+    hid_t             ret_value = H5I_INVALID_HID; /* Return value */
 
     FUNC_ENTER_API(H5I_INVALID_HID)
-    H5TRACE7("i", "i*siiiii", loc_id, name, key_type_id, val_type_id, lcpl_id,
-             mcpl_id, mapl_id);
+    H5TRACE7("i", "i*siiiii", loc_id, name, key_type_id, val_type_id, lcpl_id, mcpl_id, mapl_id);
 
     /* Check arguments */
-    if(!name)
+    if (!name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, H5I_INVALID_HID, "name parameter cannot be NULL")
-    if(!*name)
+    if (!*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, H5I_INVALID_HID, "name parameter cannot be an empty string")
 
     /* Get link creation property list */
-    if(H5P_DEFAULT == lcpl_id)
+    if (H5P_DEFAULT == lcpl_id)
         lcpl_id = H5P_LINK_CREATE_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(lcpl_id, H5P_LINK_CREATE))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5I_INVALID_HID, "lcpl_id is not a link creation property list")
+    else if (TRUE != H5P_isa_class(lcpl_id, H5P_LINK_CREATE))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5I_INVALID_HID, "lcpl_id is not a link creation property list")
 
     /* Get map creation property list */
-    if(H5P_DEFAULT == mcpl_id)
+    if (H5P_DEFAULT == mcpl_id)
         mcpl_id = H5P_MAP_CREATE_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(mcpl_id, H5P_MAP_CREATE))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5I_INVALID_HID, "mcpl_id is not a map create property list ID")
+    else if (TRUE != H5P_isa_class(mcpl_id, H5P_MAP_CREATE))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5I_INVALID_HID, "mcpl_id is not a map create property list ID")
 
     /* Verify access property list and set up collective metadata if appropriate */
-    if(H5CX_set_apl(&mapl_id, H5P_CLS_MACC, loc_id, TRUE) < 0)
+    if (H5CX_set_apl(&mapl_id, H5P_CLS_MACC, loc_id, TRUE) < 0)
         HGOTO_ERROR(H5E_MAP, H5E_CANTSET, H5I_INVALID_HID, "can't set access property list info")
 
     /* Get the location object */
-    if(NULL == (vol_obj = (H5VL_object_t *)H5I_object(loc_id)))
+    if (NULL == (vol_obj = (H5VL_object_t *)H5I_object(loc_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5I_INVALID_HID, "invalid location identifier")
 
     /* Set location parameters */
-    loc_params.type         = H5VL_OBJECT_BY_SELF;
-    loc_params.obj_type     = H5I_get_type(loc_id);
+    loc_params.type     = H5VL_OBJECT_BY_SELF;
+    loc_params.obj_type = H5I_get_type(loc_id);
 
     /* Create the map */
-    if(H5VL_optional(vol_obj, H5VL_MAP_CREATE, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL,
-            &loc_params, name, lcpl_id, key_type_id, val_type_id, mcpl_id, mapl_id, &map) < 0)
+    if (H5VL_optional(vol_obj, H5VL_MAP_CREATE, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, &loc_params, name,
+                      lcpl_id, key_type_id, val_type_id, mcpl_id, mapl_id, &map) < 0)
         HGOTO_ERROR(H5E_MAP, H5E_CANTINIT, H5I_INVALID_HID, "unable to create map")
 
     /* Get an atom for the map */
-    if((ret_value = H5VL_register(H5I_MAP, map, vol_obj->connector, TRUE)) < 0)
+    if ((ret_value = H5VL_register(H5I_MAP, map, vol_obj->connector, TRUE)) < 0)
         HGOTO_ERROR(H5E_MAP, H5E_CANTREGISTER, H5I_INVALID_HID, "unable to atomize map handle")
 
 done:
     /* Cleanup on failure */
-    if(H5I_INVALID_HID == ret_value)
-        if(map && H5VL_optional(vol_obj, H5VL_MAP_CLOSE, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL) < 0)
+    if (H5I_INVALID_HID == ret_value)
+        if (map && H5VL_optional(vol_obj, H5VL_MAP_CLOSE, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL) < 0)
             HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, H5I_INVALID_HID, "unable to release map")
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Mcreate() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Mcreate_anon
  *
@@ -340,30 +321,28 @@ done:
  *-------------------------------------------------------------------------
  */
 hid_t
-H5Mcreate_anon(hid_t loc_id, hid_t key_type_id, hid_t val_type_id,
-    hid_t mcpl_id, hid_t mapl_id)
+H5Mcreate_anon(hid_t loc_id, hid_t key_type_id, hid_t val_type_id, hid_t mcpl_id, hid_t mapl_id)
 {
-    void                *map = NULL;                    /* map object from VOL connector */
-    H5VL_object_t       *vol_obj = NULL;                /* object of loc_id */
-    H5VL_loc_params_t   loc_params;
-    hid_t               ret_value   = H5I_INVALID_HID;  /* Return value */
+    void *            map     = NULL; /* map object from VOL connector */
+    H5VL_object_t *   vol_obj = NULL; /* object of loc_id */
+    H5VL_loc_params_t loc_params;
+    hid_t             ret_value = H5I_INVALID_HID; /* Return value */
 
     FUNC_ENTER_API(H5I_INVALID_HID)
     H5TRACE5("i", "iiiii", loc_id, key_type_id, val_type_id, mcpl_id, mapl_id);
 
     /* Check arguments */
-    if(H5P_DEFAULT == mcpl_id)
+    if (H5P_DEFAULT == mcpl_id)
         mcpl_id = H5P_MAP_CREATE_DEFAULT;
-    else
-        if(TRUE != H5P_isa_class(mcpl_id, H5P_MAP_CREATE))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5I_INVALID_HID, "not map create property list ID")
+    else if (TRUE != H5P_isa_class(mcpl_id, H5P_MAP_CREATE))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5I_INVALID_HID, "not map create property list ID")
 
     /* Verify access property list and set up collective metadata if appropriate */
-    if(H5CX_set_apl(&mapl_id, H5P_CLS_MACC, loc_id, TRUE) < 0)
+    if (H5CX_set_apl(&mapl_id, H5P_CLS_MACC, loc_id, TRUE) < 0)
         HGOTO_ERROR(H5E_MAP, H5E_CANTSET, H5I_INVALID_HID, "can't set access property list info")
 
     /* get the location object */
-    if(NULL == (vol_obj = (H5VL_object_t *)H5I_object(loc_id)))
+    if (NULL == (vol_obj = (H5VL_object_t *)H5I_object(loc_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5I_INVALID_HID, "invalid location identifier")
 
     /* Set location parameters */
@@ -371,24 +350,23 @@ H5Mcreate_anon(hid_t loc_id, hid_t key_type_id, hid_t val_type_id,
     loc_params.obj_type = H5I_get_type(loc_id);
 
     /* Create the map */
-    if(H5VL_optional(vol_obj, H5VL_MAP_CREATE, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL,
-            &loc_params, NULL, H5P_LINK_CREATE_DEFAULT, key_type_id, val_type_id, mcpl_id, mapl_id, &map) < 0)
+    if (H5VL_optional(vol_obj, H5VL_MAP_CREATE, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, &loc_params, NULL,
+                      H5P_LINK_CREATE_DEFAULT, key_type_id, val_type_id, mcpl_id, mapl_id, &map) < 0)
         HGOTO_ERROR(H5E_MAP, H5E_CANTINIT, H5I_INVALID_HID, "unable to create map")
 
     /* Get an atom for the map */
-    if((ret_value = H5VL_register(H5I_MAP, map, vol_obj->connector, TRUE)) < 0)
+    if ((ret_value = H5VL_register(H5I_MAP, map, vol_obj->connector, TRUE)) < 0)
         HGOTO_ERROR(H5E_MAP, H5E_CANTREGISTER, H5I_INVALID_HID, "unable to register map")
 
 done:
     /* Cleanup on failure */
-    if(H5I_INVALID_HID == ret_value)
-        if(map && H5VL_optional(vol_obj, H5VL_MAP_CLOSE, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL) < 0)
+    if (H5I_INVALID_HID == ret_value)
+        if (map && H5VL_optional(vol_obj, H5VL_MAP_CLOSE, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL) < 0)
             HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, H5I_INVALID_HID, "unable to release map")
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Mcreate_anon() */
 
-
 /*------------------------------------------------------------------------
  * Function:    H5Mopen
  *
@@ -407,50 +385,50 @@ done:
 hid_t
 H5Mopen(hid_t loc_id, const char *name, hid_t mapl_id)
 {
-    void               *map = NULL;             /* map object from VOL connector */
-    H5VL_object_t      *vol_obj = NULL;         /* object of loc_id */
-    H5VL_loc_params_t   loc_params;
-    hid_t               ret_value   = H5I_INVALID_HID;  /* Return value */
+    void *            map     = NULL; /* map object from VOL connector */
+    H5VL_object_t *   vol_obj = NULL; /* object of loc_id */
+    H5VL_loc_params_t loc_params;
+    hid_t             ret_value = H5I_INVALID_HID; /* Return value */
 
     FUNC_ENTER_API(H5I_INVALID_HID)
     H5TRACE3("i", "i*si", loc_id, name, mapl_id);
 
     /* Check args */
-    if(!name)
+    if (!name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, H5I_INVALID_HID, "name parameter cannot be NULL")
-    if(!*name)
+    if (!*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, H5I_INVALID_HID, "name parameter cannot be an empty string")
 
     /* Verify access property list and set up collective metadata if appropriate */
-    if(H5CX_set_apl(&mapl_id, H5P_CLS_MACC, loc_id, FALSE) < 0)
+    if (H5CX_set_apl(&mapl_id, H5P_CLS_MACC, loc_id, FALSE) < 0)
         HGOTO_ERROR(H5E_MAP, H5E_CANTSET, H5I_INVALID_HID, "can't set access property list info")
 
     /* get the location object */
-    if(NULL == (vol_obj = (H5VL_object_t *)H5I_object(loc_id)))
+    if (NULL == (vol_obj = (H5VL_object_t *)H5I_object(loc_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5I_INVALID_HID, "invalid location identifier")
 
     /* Set the location parameters */
-    loc_params.type         = H5VL_OBJECT_BY_SELF;
-    loc_params.obj_type     = H5I_get_type(loc_id);
+    loc_params.type     = H5VL_OBJECT_BY_SELF;
+    loc_params.obj_type = H5I_get_type(loc_id);
 
     /* Open the map */
-    if(H5VL_optional(vol_obj, H5VL_MAP_OPEN, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, &loc_params, name, mapl_id, &map) < 0)
+    if (H5VL_optional(vol_obj, H5VL_MAP_OPEN, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, &loc_params, name,
+                      mapl_id, &map) < 0)
         HGOTO_ERROR(H5E_MAP, H5E_CANTOPENOBJ, H5I_INVALID_HID, "unable to open map")
 
     /* Register an atom for the map */
-    if((ret_value = H5VL_register(H5I_MAP, map, vol_obj->connector, TRUE)) < 0)
+    if ((ret_value = H5VL_register(H5I_MAP, map, vol_obj->connector, TRUE)) < 0)
         HGOTO_ERROR(H5E_MAP, H5E_CANTREGISTER, H5I_INVALID_HID, "can't register map atom")
 
 done:
     /* Cleanup on failure */
-    if(H5I_INVALID_HID == ret_value)
-        if(map && H5VL_optional(vol_obj, H5VL_MAP_CLOSE, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL) < 0)
+    if (H5I_INVALID_HID == ret_value)
+        if (map && H5VL_optional(vol_obj, H5VL_MAP_CLOSE, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL) < 0)
             HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, H5I_INVALID_HID, "unable to release map")
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Mopen() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Mclose
  *
@@ -465,26 +443,25 @@ done:
 herr_t
 H5Mclose(hid_t map_id)
 {
-    herr_t  ret_value = SUCCEED;    /* Return value                     */
+    herr_t ret_value = SUCCEED; /* Return value                     */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "i", map_id);
 
     /* Check args */
-    if(H5I_MAP != H5I_get_type(map_id))
+    if (H5I_MAP != H5I_get_type(map_id))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a map ID")
 
     /* Decrement the counter on the map.  It will be freed if the count
      * reaches zero.
      */
-    if(H5I_dec_app_ref_always_close(map_id) < 0)
+    if (H5I_dec_app_ref_always_close(map_id) < 0)
         HGOTO_ERROR(H5E_MAP, H5E_CANTDEC, FAIL, "can't decrement count on map ID")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Mclose() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Mget_key_type
  *
@@ -501,25 +478,25 @@ done:
 hid_t
 H5Mget_key_type(hid_t map_id)
 {
-    H5VL_object_t  *vol_obj;                        /* Map structure    */
-    hid_t           ret_value = H5I_INVALID_HID;    /* Return value         */
+    H5VL_object_t *vol_obj;                     /* Map structure    */
+    hid_t          ret_value = H5I_INVALID_HID; /* Return value         */
 
     FUNC_ENTER_API(H5I_INVALID_HID)
     H5TRACE1("i", "i", map_id);
 
     /* Check args */
-    if(NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(map_id, H5I_MAP)))
+    if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(map_id, H5I_MAP)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5I_INVALID_HID, "invalid map identifier")
 
     /* get the datatype */
-    if(H5VL_optional(vol_obj, H5VL_MAP_GET, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, H5VL_MAP_GET_KEY_TYPE, &ret_value) < 0)
+    if (H5VL_optional(vol_obj, H5VL_MAP_GET, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, H5VL_MAP_GET_KEY_TYPE,
+                      &ret_value) < 0)
         HGOTO_ERROR(H5E_MAP, H5E_CANTGET, H5I_INVALID_HID, "unable to get datatype")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Mget_key_type() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Mget_val_type
  *
@@ -536,25 +513,25 @@ done:
 hid_t
 H5Mget_val_type(hid_t map_id)
 {
-    H5VL_object_t  *vol_obj;                        /* Map structure    */
-    hid_t           ret_value = H5I_INVALID_HID;    /* Return value         */
+    H5VL_object_t *vol_obj;                     /* Map structure    */
+    hid_t          ret_value = H5I_INVALID_HID; /* Return value         */
 
     FUNC_ENTER_API(H5I_INVALID_HID)
     H5TRACE1("i", "i", map_id);
 
     /* Check args */
-    if(NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(map_id, H5I_MAP)))
+    if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(map_id, H5I_MAP)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5I_INVALID_HID, "invalid map identifier")
 
     /* get the datatype */
-    if(H5VL_optional(vol_obj, H5VL_MAP_GET, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, H5VL_MAP_GET_VAL_TYPE, &ret_value) < 0)
+    if (H5VL_optional(vol_obj, H5VL_MAP_GET, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, H5VL_MAP_GET_VAL_TYPE,
+                      &ret_value) < 0)
         HGOTO_ERROR(H5E_MAP, H5E_CANTGET, H5I_INVALID_HID, "unable to get datatype")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Mget_val_type() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Mget_create_plist
  *
@@ -571,25 +548,25 @@ done:
 hid_t
 H5Mget_create_plist(hid_t map_id)
 {
-    H5VL_object_t  *vol_obj;                        /* Map structure    */
-    hid_t           ret_value = H5I_INVALID_HID;    /* Return value         */
+    H5VL_object_t *vol_obj;                     /* Map structure    */
+    hid_t          ret_value = H5I_INVALID_HID; /* Return value         */
 
     FUNC_ENTER_API(H5I_INVALID_HID)
     H5TRACE1("i", "i", map_id);
 
     /* Check args */
-    if(NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(map_id, H5I_MAP)))
+    if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(map_id, H5I_MAP)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5I_INVALID_HID, "invalid map identifier")
 
     /* Get the map creation property list */
-    if(H5VL_optional(vol_obj, H5VL_MAP_GET, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, H5VL_MAP_GET_MCPL, &ret_value) < 0)
+    if (H5VL_optional(vol_obj, H5VL_MAP_GET, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, H5VL_MAP_GET_MCPL,
+                      &ret_value) < 0)
         HGOTO_ERROR(H5E_MAP, H5E_CANTGET, H5I_INVALID_HID, "unable to get map creation properties")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Mget_create_plist() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Mget_access_plist
  *
@@ -609,25 +586,25 @@ done:
 hid_t
 H5Mget_access_plist(hid_t map_id)
 {
-    H5VL_object_t  *vol_obj;                        /* Map structure    */
-    hid_t           ret_value = H5I_INVALID_HID;    /* Return value         */
+    H5VL_object_t *vol_obj;                     /* Map structure    */
+    hid_t          ret_value = H5I_INVALID_HID; /* Return value         */
 
     FUNC_ENTER_API(H5I_INVALID_HID)
     H5TRACE1("i", "i", map_id);
 
     /* Check args */
-    if(NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(map_id, H5I_MAP)))
+    if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(map_id, H5I_MAP)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5I_INVALID_HID, "invalid map identifier")
 
     /* Get the map access property list */
-    if(H5VL_optional(vol_obj, H5VL_MAP_GET, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, H5VL_MAP_GET_MAPL, &ret_value) < 0)
+    if (H5VL_optional(vol_obj, H5VL_MAP_GET, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, H5VL_MAP_GET_MAPL,
+                      &ret_value) < 0)
         HGOTO_ERROR(H5E_MAP, H5E_CANTGET, H5I_INVALID_HID, "unable to get map access properties")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Mget_access_plist() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Mget_count
  *
@@ -643,35 +620,33 @@ done:
 herr_t
 H5Mget_count(hid_t map_id, hsize_t *count, hid_t dxpl_id)
 {
-    H5VL_object_t  *vol_obj;                        /* Map structure    */
-    herr_t          ret_value = SUCCEED;            /* Return value         */
+    H5VL_object_t *vol_obj;             /* Map structure    */
+    herr_t         ret_value = SUCCEED; /* Return value         */
 
     FUNC_ENTER_API(H5I_INVALID_HID)
     H5TRACE3("e", "i*hi", map_id, count, dxpl_id);
 
     /* Check args */
-    if(NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(map_id, H5I_MAP)))
+    if (NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(map_id, H5I_MAP)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5I_INVALID_HID, "invalid map identifier")
 
     /* Get the default dataset transfer property list if the user didn't provide one */
     if (H5P_DEFAULT == dxpl_id)
         dxpl_id = H5P_DATASET_XFER_DEFAULT;
-    else
-        if (TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms")
+    else if (TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms")
 
     /* Set DXPL for operation */
     H5CX_set_dxpl(dxpl_id);
 
     /* Get the number of key-value pairs stored in the map */
-    if(H5VL_optional(vol_obj, H5VL_MAP_GET, dxpl_id, H5_REQUEST_NULL, H5VL_MAP_GET_COUNT, count) < 0)
+    if (H5VL_optional(vol_obj, H5VL_MAP_GET, dxpl_id, H5_REQUEST_NULL, H5VL_MAP_GET_COUNT, count) < 0)
         HGOTO_ERROR(H5E_MAP, H5E_CANTGET, H5I_INVALID_HID, "unable to get map access properties")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Mget_count() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Mput
  *
@@ -689,15 +664,14 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Mput(hid_t map_id, hid_t key_mem_type_id, const void *key,
-    hid_t val_mem_type_id, const void *value, hid_t dxpl_id)
+H5Mput(hid_t map_id, hid_t key_mem_type_id, const void *key, hid_t val_mem_type_id, const void *value,
+       hid_t dxpl_id)
 {
-    H5VL_object_t          *vol_obj = NULL;
-    herr_t                  ret_value = SUCCEED;    /* Return value */
+    H5VL_object_t *vol_obj   = NULL;
+    herr_t         ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE6("e", "ii*xi*xi", map_id, key_mem_type_id, key, val_mem_type_id, value,
-             dxpl_id);
+    H5TRACE6("e", "ii*xi*xi", map_id, key_mem_type_id, key, val_mem_type_id, value, dxpl_id);
 
     /* Check arguments */
     if (key_mem_type_id < 0)
@@ -712,22 +686,21 @@ H5Mput(hid_t map_id, hid_t key_mem_type_id, const void *key,
     /* Get the default dataset transfer property list if the user didn't provide one */
     if (H5P_DEFAULT == dxpl_id)
         dxpl_id = H5P_DATASET_XFER_DEFAULT;
-    else
-        if (TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms")
+    else if (TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms")
 
     /* Set DXPL for operation */
     H5CX_set_dxpl(dxpl_id);
 
     /* Set the key/value pair */
-    if(H5VL_optional(vol_obj, H5VL_MAP_PUT, dxpl_id, H5_REQUEST_NULL, key_mem_type_id, key, val_mem_type_id, value) < 0)
+    if (H5VL_optional(vol_obj, H5VL_MAP_PUT, dxpl_id, H5_REQUEST_NULL, key_mem_type_id, key, val_mem_type_id,
+                      value) < 0)
         HGOTO_ERROR(H5E_MAP, H5E_CANTSET, FAIL, "unable to put key/value pair")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Mput() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Mget
  *
@@ -748,15 +721,14 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Mget(hid_t map_id, hid_t key_mem_type_id, const void *key,
-    hid_t val_mem_type_id, void *value, hid_t dxpl_id)
+H5Mget(hid_t map_id, hid_t key_mem_type_id, const void *key, hid_t val_mem_type_id, void *value,
+       hid_t dxpl_id)
 {
-    H5VL_object_t          *vol_obj = NULL;
-    herr_t                  ret_value = SUCCEED;    /* Return value */
+    H5VL_object_t *vol_obj   = NULL;
+    herr_t         ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE6("e", "ii*xi*xi", map_id, key_mem_type_id, key, val_mem_type_id, value,
-             dxpl_id);
+    H5TRACE6("e", "ii*xi*xi", map_id, key_mem_type_id, key, val_mem_type_id, value, dxpl_id);
 
     /* Check arguments */
     if (key_mem_type_id < 0)
@@ -771,22 +743,21 @@ H5Mget(hid_t map_id, hid_t key_mem_type_id, const void *key,
     /* Get the default dataset transfer property list if the user didn't provide one */
     if (H5P_DEFAULT == dxpl_id)
         dxpl_id = H5P_DATASET_XFER_DEFAULT;
-    else
-        if (TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms")
+    else if (TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms")
 
     /* Set DXPL for operation */
     H5CX_set_dxpl(dxpl_id);
 
     /* Get the value for the key */
-    if(H5VL_optional(vol_obj, H5VL_MAP_GET_VAL, dxpl_id, H5_REQUEST_NULL, key_mem_type_id, key, val_mem_type_id, value) < 0)
+    if (H5VL_optional(vol_obj, H5VL_MAP_GET_VAL, dxpl_id, H5_REQUEST_NULL, key_mem_type_id, key,
+                      val_mem_type_id, value) < 0)
         HGOTO_ERROR(H5E_MAP, H5E_CANTGET, FAIL, "unable to get value from map")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Mget() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Mexists
  *
@@ -801,11 +772,10 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Mexists(hid_t map_id, hid_t key_mem_type_id, const void *key, hbool_t *exists,
-    hid_t dxpl_id)
+H5Mexists(hid_t map_id, hid_t key_mem_type_id, const void *key, hbool_t *exists, hid_t dxpl_id)
 {
-    H5VL_object_t          *vol_obj = NULL;
-    herr_t                  ret_value = SUCCEED;    /* Return value */
+    H5VL_object_t *vol_obj   = NULL;
+    herr_t         ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE5("e", "ii*x*bi", map_id, key_mem_type_id, key, exists, dxpl_id);
@@ -821,22 +791,21 @@ H5Mexists(hid_t map_id, hid_t key_mem_type_id, const void *key, hbool_t *exists,
     /* Get the default dataset transfer property list if the user didn't provide one */
     if (H5P_DEFAULT == dxpl_id)
         dxpl_id = H5P_DATASET_XFER_DEFAULT;
-    else
-        if (TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms")
+    else if (TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms")
 
     /* Set DXPL for operation */
     H5CX_set_dxpl(dxpl_id);
 
     /* Check if key exists */
-    if((ret_value = H5VL_optional(vol_obj, H5VL_MAP_EXISTS, dxpl_id, H5_REQUEST_NULL, key_mem_type_id, key, exists)) < 0)
+    if ((ret_value = H5VL_optional(vol_obj, H5VL_MAP_EXISTS, dxpl_id, H5_REQUEST_NULL, key_mem_type_id, key,
+                                   exists)) < 0)
         HGOTO_ERROR(H5E_MAP, H5E_CANTGET, ret_value, "unable to check if key exists")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Mexists() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Miterate
  *
@@ -869,12 +838,11 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Miterate(hid_t map_id, hsize_t *idx, hid_t key_mem_type_id, H5M_iterate_t op,
-    void *op_data, hid_t dxpl_id)
+H5Miterate(hid_t map_id, hsize_t *idx, hid_t key_mem_type_id, H5M_iterate_t op, void *op_data, hid_t dxpl_id)
 {
-    H5VL_object_t          *vol_obj = NULL;
-    H5VL_loc_params_t       loc_params;
-    herr_t                  ret_value = SUCCEED;    /* Return value */
+    H5VL_object_t *   vol_obj = NULL;
+    H5VL_loc_params_t loc_params;
+    herr_t            ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE6("e", "i*hix*xi", map_id, idx, key_mem_type_id, op, op_data, dxpl_id);
@@ -892,26 +860,25 @@ H5Miterate(hid_t map_id, hsize_t *idx, hid_t key_mem_type_id, H5M_iterate_t op,
     /* Get the default dataset transfer property list if the user didn't provide one */
     if (H5P_DEFAULT == dxpl_id)
         dxpl_id = H5P_DATASET_XFER_DEFAULT;
-    else
-        if (TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms")
+    else if (TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms")
 
     /* Set DXPL for operation */
     H5CX_set_dxpl(dxpl_id);
 
     /* Set location struct fields */
-    loc_params.type = H5VL_OBJECT_BY_SELF;
+    loc_params.type     = H5VL_OBJECT_BY_SELF;
     loc_params.obj_type = H5I_get_type(map_id);
 
     /* Iterate over keys */
-    if((ret_value = H5VL_optional(vol_obj, H5VL_MAP_SPECIFIC, dxpl_id, H5_REQUEST_NULL, &loc_params, H5VL_MAP_ITER, idx, key_mem_type_id, op, op_data)) < 0)
+    if ((ret_value = H5VL_optional(vol_obj, H5VL_MAP_SPECIFIC, dxpl_id, H5_REQUEST_NULL, &loc_params,
+                                   H5VL_MAP_ITER, idx, key_mem_type_id, op, op_data)) < 0)
         HGOTO_ERROR(H5E_MAP, H5E_BADITER, ret_value, "unable to ierate over keys")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Miterate() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Miterate_by_name
  *
@@ -944,22 +911,20 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Miterate_by_name(hid_t loc_id, const char *map_name, hsize_t *idx,
-    hid_t key_mem_type_id, H5M_iterate_t op, void *op_data, hid_t dxpl_id,
-    hid_t lapl_id)
+H5Miterate_by_name(hid_t loc_id, const char *map_name, hsize_t *idx, hid_t key_mem_type_id, H5M_iterate_t op,
+                   void *op_data, hid_t dxpl_id, hid_t lapl_id)
 {
-    H5VL_object_t          *vol_obj = NULL;
-    H5VL_loc_params_t       loc_params;
-    herr_t                  ret_value = SUCCEED;    /* Return value */
+    H5VL_object_t *   vol_obj = NULL;
+    H5VL_loc_params_t loc_params;
+    herr_t            ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE8("e", "i*s*hix*xii", loc_id, map_name, idx, key_mem_type_id, op,
-             op_data, dxpl_id, lapl_id);
+    H5TRACE8("e", "i*s*hix*xii", loc_id, map_name, idx, key_mem_type_id, op, op_data, dxpl_id, lapl_id);
 
     /* Check arguments */
-    if(!map_name)
+    if (!map_name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "map_name parameter cannot be NULL")
-    if(!*map_name)
+    if (!*map_name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "map_name parameter cannot be an empty string")
     if (key_mem_type_id < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid key memory datatype ID")
@@ -973,9 +938,8 @@ H5Miterate_by_name(hid_t loc_id, const char *map_name, hsize_t *idx,
     /* Get the default dataset transfer property list if the user didn't provide one */
     if (H5P_DEFAULT == dxpl_id)
         dxpl_id = H5P_DATASET_XFER_DEFAULT;
-    else
-        if (TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms")
+    else if (TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms")
 
     /* Set DXPL for operation */
     H5CX_set_dxpl(dxpl_id);
@@ -987,14 +951,14 @@ H5Miterate_by_name(hid_t loc_id, const char *map_name, hsize_t *idx,
     loc_params.loc_data.loc_by_name.lapl_id = lapl_id;
 
     /* Iterate over keys */
-    if((ret_value = H5VL_optional(vol_obj, H5VL_MAP_SPECIFIC, dxpl_id, H5_REQUEST_NULL, &loc_params, H5VL_MAP_ITER, idx, key_mem_type_id, op, op_data)) < 0)
+    if ((ret_value = H5VL_optional(vol_obj, H5VL_MAP_SPECIFIC, dxpl_id, H5_REQUEST_NULL, &loc_params,
+                                   H5VL_MAP_ITER, idx, key_mem_type_id, op, op_data)) < 0)
         HGOTO_ERROR(H5E_MAP, H5E_BADITER, ret_value, "unable to ierate over keys")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Miterate_by_name() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Mdelete
  *
@@ -1011,12 +975,11 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Mdelete(hid_t map_id, hid_t key_mem_type_id, const void *key,
-    hid_t dxpl_id)
+H5Mdelete(hid_t map_id, hid_t key_mem_type_id, const void *key, hid_t dxpl_id)
 {
-    H5VL_object_t          *vol_obj = NULL;
-    H5VL_loc_params_t       loc_params;
-    herr_t                  ret_value = SUCCEED;    /* Return value */
+    H5VL_object_t *   vol_obj = NULL;
+    H5VL_loc_params_t loc_params;
+    herr_t            ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE4("e", "ii*xi", map_id, key_mem_type_id, key, dxpl_id);
@@ -1032,19 +995,19 @@ H5Mdelete(hid_t map_id, hid_t key_mem_type_id, const void *key,
     /* Get the default dataset transfer property list if the user didn't provide one */
     if (H5P_DEFAULT == dxpl_id)
         dxpl_id = H5P_DATASET_XFER_DEFAULT;
-    else
-        if (TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms")
+    else if (TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms")
 
     /* Set DXPL for operation */
     H5CX_set_dxpl(dxpl_id);
 
     /* Set location struct fields */
-    loc_params.type = H5VL_OBJECT_BY_SELF;
+    loc_params.type     = H5VL_OBJECT_BY_SELF;
     loc_params.obj_type = H5I_get_type(map_id);
 
     /* Delete the key/value pair */
-    if(H5VL_optional(vol_obj, H5VL_MAP_SPECIFIC, dxpl_id, H5_REQUEST_NULL, &loc_params, H5VL_MAP_DELETE, key_mem_type_id, key) < 0)
+    if (H5VL_optional(vol_obj, H5VL_MAP_SPECIFIC, dxpl_id, H5_REQUEST_NULL, &loc_params, H5VL_MAP_DELETE,
+                      key_mem_type_id, key) < 0)
         HGOTO_ERROR(H5E_MAP, H5E_CANTSET, FAIL, "unable to delete key/value pair")
 
 done:
@@ -1052,4 +1015,3 @@ done:
 } /* end H5Mdelete() */
 
 #endif /*  H5_HAVE_MAP_API */
-