Brings over S3 and HDFS VFD changes from develop

1 files changed, 302 insertions, 447 deletions

diff --git a/src/H5FDros3.c b/src/H5FDros3.c
index a1328ec..c024716 100644
--- a/src/H5FDros3.c
+++ b/src/H5FDros3.c
@@ -212,66 +212,67 @@ typedef struct H5FD_ros3_t {
  *                  Only included if it may be used -- ROS3 VFD is enabled.
  *
  */
-#define MAXADDR (((haddr_t)1<<(8*sizeof(HDoff_t)-1))-1)
+#define MAXADDR (((haddr_t)1 << (8 * sizeof(HDoff_t) - 1)) - 1)
 #define ADDR_OVERFLOW(A)    (HADDR_UNDEF==(A) || ((A) & ~(haddr_t)MAXADDR))
 
 /* Prototypes */
-static herr_t  H5FD_ros3_term(void);
-static void   *H5FD_ros3_fapl_get(H5FD_t *_file);
-static void   *H5FD_ros3_fapl_copy(const void *_old_fa);
-static herr_t  H5FD_ros3_fapl_free(void *_fa);
-static H5FD_t *H5FD_ros3_open(const char *name, unsigned flags, hid_t fapl_id,
+static herr_t  H5FD__ros3_term(void);
+static void   *H5FD__ros3_fapl_get(H5FD_t *_file);
+static void   *H5FD__ros3_fapl_copy(const void *_old_fa);
+static herr_t  H5FD__ros3_fapl_free(void *_fa);
+static H5FD_t *H5FD__ros3_open(const char *name, unsigned flags, hid_t fapl_id,
                               haddr_t maxaddr);
-static herr_t  H5FD_ros3_close(H5FD_t *_file);
-static int     H5FD_ros3_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
-static herr_t  H5FD_ros3_query(const H5FD_t *_f1, unsigned long *flags);
-static haddr_t H5FD_ros3_get_eoa(const H5FD_t *_file, H5FD_mem_t type);
-static herr_t  H5FD_ros3_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr);
-static haddr_t H5FD_ros3_get_eof(const H5FD_t *_file, H5FD_mem_t type);
-static herr_t  H5FD_ros3_get_handle(H5FD_t *_file, hid_t fapl,
+static herr_t  H5FD__ros3_close(H5FD_t *_file);
+static int     H5FD__ros3_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
+static herr_t  H5FD__ros3_query(const H5FD_t *_f1, unsigned long *flags);
+static haddr_t H5FD__ros3_get_eoa(const H5FD_t *_file, H5FD_mem_t type);
+static herr_t  H5FD__ros3_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr);
+static haddr_t H5FD__ros3_get_eof(const H5FD_t *_file, H5FD_mem_t type);
+static herr_t  H5FD__ros3_get_handle(H5FD_t *_file, hid_t fapl,
                                     void** file_handle);
-static herr_t  H5FD_ros3_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id,
+static herr_t  H5FD__ros3_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id,
                                haddr_t addr, size_t size, void *buf);
-static herr_t  H5FD_ros3_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id,
+static herr_t  H5FD__ros3_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id,
                                haddr_t addr, size_t size, const void *buf);
-static herr_t  H5FD_ros3_truncate(H5FD_t *_file, hid_t dxpl_id,
+static herr_t  H5FD__ros3_truncate(H5FD_t *_file, hid_t dxpl_id,
                                   hbool_t closing);
-static herr_t  H5FD_ros3_lock(H5FD_t *_file, hbool_t rw);
-static herr_t  H5FD_ros3_unlock(H5FD_t *_file);
-static herr_t  H5FD_ros3_validate_config(const H5FD_ros3_fapl_t * fa);
+static herr_t  H5FD__ros3_lock(H5FD_t *_file, hbool_t rw);
+static herr_t  H5FD__ros3_unlock(H5FD_t *_file);
+
+static herr_t  H5FD__ros3_validate_config(const H5FD_ros3_fapl_t * fa);
 
 static const H5FD_class_t H5FD_ros3_g = {
     "ros3",                     /* name                 */
     MAXADDR,                    /* maxaddr              */
     H5F_CLOSE_WEAK,             /* fc_degree            */
-    H5FD_ros3_term,             /* terminate            */
+    H5FD__ros3_term,            /* terminate            */
     NULL,                       /* sb_size              */
     NULL,                       /* sb_encode            */
     NULL,                       /* sb_decode            */
     sizeof(H5FD_ros3_fapl_t),   /* fapl_size            */
-    H5FD_ros3_fapl_get,         /* fapl_get             */
-    H5FD_ros3_fapl_copy,        /* fapl_copy            */
-    H5FD_ros3_fapl_free,        /* fapl_free            */
+    H5FD__ros3_fapl_get,        /* fapl_get             */
+    H5FD__ros3_fapl_copy,       /* fapl_copy            */
+    H5FD__ros3_fapl_free,       /* fapl_free            */
     0,                          /* dxpl_size            */
     NULL,                       /* dxpl_copy            */
     NULL,                       /* dxpl_free            */
-    H5FD_ros3_open,             /* open                 */
-    H5FD_ros3_close,            /* close                */
-    H5FD_ros3_cmp,              /* cmp                  */
-    H5FD_ros3_query,            /* query                */
+    H5FD__ros3_open,            /* open                 */
+    H5FD__ros3_close,           /* close                */
+    H5FD__ros3_cmp,             /* cmp                  */
+    H5FD__ros3_query,           /* query                */
     NULL,                       /* get_type_map         */
     NULL,                       /* alloc                */
     NULL,                       /* free                 */
-    H5FD_ros3_get_eoa,          /* get_eoa              */
-    H5FD_ros3_set_eoa,          /* set_eoa              */
-    H5FD_ros3_get_eof,          /* get_eof              */
-    H5FD_ros3_get_handle,       /* get_handle           */
-    H5FD_ros3_read,             /* read                 */
-    H5FD_ros3_write,            /* write                */
+    H5FD__ros3_get_eoa,         /* get_eoa              */
+    H5FD__ros3_set_eoa,         /* set_eoa              */
+    H5FD__ros3_get_eof,         /* get_eof              */
+    H5FD__ros3_get_handle,      /* get_handle           */
+    H5FD__ros3_read,            /* read                 */
+    H5FD__ros3_write,           /* write                */
     NULL,                       /* flush                */
-    H5FD_ros3_truncate,         /* truncate             */
-    H5FD_ros3_lock,             /* lock                 */
-    H5FD_ros3_unlock,           /* unlock               */
+    H5FD__ros3_truncate,        /* truncate             */
+    H5FD__ros3_lock,            /* lock                 */
+    H5FD__ros3_unlock,          /* unlock               */
     H5FD_FLMAP_DICHOTOMY        /* fl_map               */
 };
 
@@ -297,10 +298,8 @@ H5FD__init_package(void)
 
     FUNC_ENTER_STATIC
 
-    if (H5FD_ros3_init() < 0) {
-        HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL,
-                    "unable to initialize ros3 VFD")
-    }
+    if(H5FD_ros3_init() < 0)
+        HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "unable to initialize ros3 VFD")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -357,7 +356,7 @@ done:
 
 
 /*---------------------------------------------------------------------------
- * Function:    H5FD_ros3_term
+ * Function:    H5FD__ros3_term
  *
  * Purpose:     Shut down the VFD
  *
@@ -368,20 +367,19 @@ done:
  *---------------------------------------------------------------------------
  */
 static herr_t
-H5FD_ros3_term(void)
+H5FD__ros3_term(void)
 {
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
+    FUNC_ENTER_STATIC_NOERR
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5FD_ros3_term() called.\n");
+    HDfprintf(stdout, "H5FD__ros3_term() called.\n");
 #endif
 
     /* Reset VFL ID */
     H5FD_ROS3_g = 0;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-
-} /* end H5FD_ros3_term() */
+} /* end H5FD__ros3_term() */
 
 
 /*-------------------------------------------------------------------------
@@ -400,8 +398,7 @@ H5FD_ros3_term(void)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pset_fapl_ros3(hid_t             fapl_id,
-                 H5FD_ros3_fapl_t *fa)
+H5Pset_fapl_ros3(hid_t fapl_id, H5FD_ros3_fapl_t *fa)
 {
     H5P_genplist_t *plist     = NULL; /* Property list pointer */
     herr_t          ret_value = FAIL;
@@ -416,25 +413,21 @@ H5Pset_fapl_ros3(hid_t             fapl_id,
 #endif
 
     plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS);
-    if (plist == NULL) {
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, \
-                    "not a file access property list")
-    }
+    if(plist == NULL)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list")
 
-    if (FAIL == H5FD_ros3_validate_config(fa)) {
+    if(FAIL == H5FD__ros3_validate_config(fa))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid ros3 config")
-    }
 
     ret_value = H5P_set_driver(plist, H5FD_ROS3, (void *)fa);
 
 done:
     FUNC_LEAVE_API(ret_value)
-
 } /* end H5Pset_fapl_ros3() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5FD_ros3_validate_config()
+ * Function:    H5FD__ros3_validate_config()
  *
  * Purpose:     Test to see if the supplied instance of H5FD_ros3_fapl_t
  *              contains internally consistant data.  Return SUCCEED if so,
@@ -454,34 +447,25 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_ros3_validate_config(const H5FD_ros3_fapl_t * fa)
+H5FD__ros3_validate_config(const H5FD_ros3_fapl_t * fa)
 {
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
     HDassert(fa != NULL);
 
-    if ( fa->version != H5FD_CURR_ROS3_FAPL_T_VERSION ) {
-         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
-                     "Unknown H5FD_ros3_fapl_t version");
-    }
+    if(fa->version != H5FD_CURR_ROS3_FAPL_T_VERSION)
+         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Unknown H5FD_ros3_fapl_t version");
 
-    /* if set to authenticate, region and id cannot be empty strings
-     */
-    if (fa->authenticate == TRUE) {
-        if ((fa->aws_region[0] == '\0') ||
-            (fa->secret_id[0]  == '\0'))
-        {
-            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
-                        "Inconsistent authentication information");
-        }
-    }
+    /* if set to authenticate, region and id cannot be empty strings */
+    if(fa->authenticate == TRUE)
+        if((fa->aws_region[0] == '\0') || (fa->secret_id[0]  == '\0'))
+            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Inconsistent authentication information");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-
-} /* end H5FD_ros3_validate_config() */
+} /* end H5FD__ros3_validate_config() */
 
 
 /*-------------------------------------------------------------------------
@@ -500,8 +484,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pget_fapl_ros3(hid_t             fapl_id,
-                 H5FD_ros3_fapl_t *fa_out)
+H5Pget_fapl_ros3(hid_t fapl_id, H5FD_ros3_fapl_t *fa_out)
 {
     const H5FD_ros3_fapl_t *fa        = NULL;
     H5P_genplist_t         *plist     = NULL;
@@ -514,23 +497,19 @@ H5Pget_fapl_ros3(hid_t             fapl_id,
     HDfprintf(stdout, "H5Pget_fapl_ros3() called.\n");
 #endif
 
-    if (fa_out == NULL) {
+    if(fa_out == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "fa_out is NULL")
-    }
 
     plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS);
-    if (plist == NULL) {
+    if(plist == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access list")
-    }
 
-    if (H5FD_ROS3 != H5P_peek_driver(plist)) {
+    if(H5FD_ROS3 != H5P_peek_driver(plist))
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "incorrect VFL driver")
-    }
 
     fa = (const H5FD_ros3_fapl_t *)H5P_peek_driver_info(plist);
-    if (fa == NULL) {
+    if(fa == NULL)
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "bad VFL driver info")
-    }
 
     /* Copy the ros3 fapl data out */
     HDmemcpy(fa_out, fa, sizeof(H5FD_ros3_fapl_t));
@@ -541,7 +520,7 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5FD_ros3_fapl_get
+ * Function:    H5FD__ros3_fapl_get
  *
  * Purpose:     Gets a file access property list which could be used to
  *              create an identical file.
@@ -556,19 +535,17 @@ done:
  *-------------------------------------------------------------------------
  */
 static void *
-H5FD_ros3_fapl_get(H5FD_t *_file)
+H5FD__ros3_fapl_get(H5FD_t *_file)
 {
     H5FD_ros3_t      *file      = (H5FD_ros3_t*)_file;
     H5FD_ros3_fapl_t *fa        = NULL;
     void             *ret_value = NULL;
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
     fa = (H5FD_ros3_fapl_t *)H5MM_calloc(sizeof(H5FD_ros3_fapl_t));
-    if (fa == NULL) {
-        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
-                    "memory allocation failed")
-    }
+    if(fa == NULL)
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Copy the fields of the structure */
     HDmemcpy(fa, &(file->fa), sizeof(H5FD_ros3_fapl_t));
@@ -577,18 +554,16 @@ H5FD_ros3_fapl_get(H5FD_t *_file)
     ret_value = fa;
 
 done:
-    if (ret_value == NULL) {
-        if (fa != NULL) {
+    if(ret_value == NULL)
+        if(fa != NULL)
             H5MM_xfree(fa);
-        }
-    }
-    FUNC_LEAVE_NOAPI(ret_value)
 
-} /* end H5FD_ros3_fapl_get() */
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FD__ros3_fapl_get() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5FD_ros3_fapl_copy
+ * Function:    H5FD__ros3_fapl_copy
  *
  * Purpose:     Copies the ros3-specific file access properties.
  *
@@ -602,36 +577,32 @@ done:
  *-------------------------------------------------------------------------
  */
 static void *
-H5FD_ros3_fapl_copy(const void *_old_fa)
+H5FD__ros3_fapl_copy(const void *_old_fa)
 {
     const H5FD_ros3_fapl_t *old_fa    = (const H5FD_ros3_fapl_t*)_old_fa;
     H5FD_ros3_fapl_t       *new_fa    = NULL;
     void                   *ret_value = NULL;
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
     new_fa = (H5FD_ros3_fapl_t *)H5MM_malloc(sizeof(H5FD_ros3_fapl_t));
-    if (new_fa == NULL) {
-        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
-                    "memory allocation failed");
-    }
+    if(new_fa == NULL)
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed");
 
     HDmemcpy(new_fa, old_fa, sizeof(H5FD_ros3_fapl_t));
     ret_value = new_fa;
 
 done:
-    if (ret_value == NULL) {
-        if (new_fa != NULL) {
+    if(ret_value == NULL)
+        if(new_fa != NULL)
             H5MM_xfree(new_fa);
-        }
-    }
-    FUNC_LEAVE_NOAPI(ret_value)
 
-} /* end H5FD_ros3_fapl_copy() */
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FD__ros3_fapl_copy() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5FD_ros3_fapl_free
+ * Function:    H5FD__ros3_fapl_free
  *
  * Purpose:     Frees the ros3-specific file access properties.
  *
@@ -643,19 +614,18 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_ros3_fapl_free(void *_fa)
+H5FD__ros3_fapl_free(void *_fa)
 {
     H5FD_ros3_fapl_t *fa = (H5FD_ros3_fapl_t*)_fa;
 
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
+    FUNC_ENTER_STATIC_NOERR
 
     HDassert(fa != NULL); /* sanity check */
 
     H5MM_xfree(fa);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-
-} /* end H5FD_ros3_fapl_free() */
+} /* end H5FD__ros3_fapl_free() */
 
 #if ROS3_STATS
 /*----------------------------------------------------------------------------
@@ -685,18 +655,16 @@ ros3_reset_stats(H5FD_ros3_t *file)
     unsigned i         = 0;
     herr_t   ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
 #if ROS3_DEBUG
     HDprintf("ros3_reset_stats() called\n");
 #endif
 
-    if (file == NULL) {
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
-                    "file was null");
-    }
+    if(file == NULL)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file was null");
 
-    for (i = 0; i <= ROS3_STATS_BIN_COUNT; i++) {
+    for(i = 0; i <= ROS3_STATS_BIN_COUNT; i++) {
         file->raw[i].bytes  = 0;
         file->raw[i].count  = 0;
         file->raw[i].min    = (unsigned long long)ROS3_STATS_STARTING_MIN;
@@ -716,7 +684,7 @@ done:
 
 /*-------------------------------------------------------------------------
  *
- * Function: H5FD_ros3_open()
+ * Function: H5FD__ros3_open()
  *
  * Purpose:
  *
@@ -746,11 +714,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static H5FD_t *
-H5FD_ros3_open(
-        const char *url,
-        unsigned    flags,
-        hid_t       fapl_id,
-        haddr_t     maxaddr)
+H5FD__ros3_open(const char *url, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
 {
     H5FD_ros3_t      *file      = NULL;
     struct tm        *now       = NULL;
@@ -760,117 +724,89 @@ H5FD_ros3_open(
     H5FD_ros3_fapl_t  fa;
     H5FD_t           *ret_value = NULL;
 
-
-
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5FD_ros3_open() called.\n");
+    HDfprintf(stdout, "H5FD__ros3_open() called.\n");
 #endif
 
     /* Sanity check on file offsets */
     HDcompile_assert(sizeof(HDoff_t) >= sizeof(size_t));
 
     /* Check arguments */
-    if (!url || !*url)
+    if(!url || !*url)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "invalid file name")
-    if (0 == maxaddr || HADDR_UNDEF == maxaddr)
+    if(0 == maxaddr || HADDR_UNDEF == maxaddr)
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, NULL, "bogus maxaddr")
-    if (ADDR_OVERFLOW(maxaddr))
+    if(ADDR_OVERFLOW(maxaddr))
         HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, NULL, "bogus maxaddr")
-    if (flags != H5F_ACC_RDONLY)
-        HGOTO_ERROR(H5E_ARGS, H5E_UNSUPPORTED, NULL,
-                    "only Read-Only access allowed")
+    if(flags != H5F_ACC_RDONLY)
+        HGOTO_ERROR(H5E_ARGS, H5E_UNSUPPORTED, NULL, "only Read-Only access allowed")
 
-    if (FAIL == H5Pget_fapl_ros3(fapl_id, &fa)) {
+    if(FAIL == H5Pget_fapl_ros3(fapl_id, &fa))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "can't get property list")
-    }
 
-    if (CURLE_OK != curl_global_init(CURL_GLOBAL_DEFAULT)) {
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL,
-                    "unable to initialize curl global (placeholder flags)")
-    }
+    if(CURLE_OK != curl_global_init(CURL_GLOBAL_DEFAULT))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "unable to initialize curl global (placeholder flags)")
 
     /* open file; procedure depends on whether or not the fapl instructs to
      * authenticate requests or not.
      */
-    if (fa.authenticate == TRUE) {
+    if(fa.authenticate == TRUE) {
         /* compute signing key (part of AWS/S3 REST API)
          * can be re-used by user/key for 7 days after creation.
          * find way to re-use/share
          */
         now = gmnow();
         HDassert( now != NULL );
-        if (ISO8601NOW(iso8601now, now) != (ISO8601_SIZE - 1)) {
-            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL,
-                        "problem while writing iso8601 timestamp")
-        }
-        if (FAIL == H5FD_s3comms_signing_key(signing_key,
-                                             (const char *)fa.secret_key,
-                                             (const char *)fa.aws_region,
-                                             (const char *)iso8601now) )
-        {
-            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL,
-                        "problem while computing signing key")
-        }
-
-        handle = H5FD_s3comms_s3r_open(
-                 url,
-                 (const char *)fa.aws_region,
-                 (const char *)fa.secret_id,
-                 (const unsigned char *)signing_key);
-    } else {
+        if(ISO8601NOW(iso8601now, now) != (ISO8601_SIZE - 1))
+            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "problem while writing iso8601 timestamp")
+        if(FAIL == H5FD_s3comms_signing_key(signing_key, (const char *)fa.secret_key,
+                (const char *)fa.aws_region, (const char *)iso8601now))
+            HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "problem while computing signing key")
+
+        handle = H5FD_s3comms_s3r_open( url, (const char *)fa.aws_region,
+                 (const char *)fa.secret_id, (const unsigned char *)signing_key);
+    }
+    else
         handle = H5FD_s3comms_s3r_open(url, NULL, NULL, NULL);
-    } /* if/else should authenticate */
 
-    if (handle == NULL) {
+    if(handle == NULL)
         /* If we want to check CURL's say on the matter in a controlled
          * fashion, this is the place to do it, but would need to make a
          * few minor changes to s3comms `s3r_t` and `s3r_read()`.
          */
         HGOTO_ERROR(H5E_VFL, H5E_CANTOPENFILE, NULL, "could not open");
-    }
 
-    /* create new file struct
-     */
+    /* create new file struct */
     file = H5FL_CALLOC(H5FD_ros3_t);
-    if (file == NULL) {
-        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL,
-                    "unable to allocate file struct")
-    }
+    if(file == NULL)
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "unable to allocate file struct")
 
     file->s3r_handle = handle;
     HDmemcpy(&(file->fa), &fa, sizeof(H5FD_ros3_fapl_t));
 
 #if ROS3_STATS
-    if (FAIL == ros3_reset_stats(file)) {
-        HGOTO_ERROR(H5E_INTERNAL, H5E_UNINITIALIZED, NULL,
-                    "unable to reset file statistics")
-    }
+    if(FAIL == ros3_reset_stats(file))
+        HGOTO_ERROR(H5E_INTERNAL, H5E_UNINITIALIZED, NULL, "unable to reset file statistics")
 #endif /* ROS3_STATS */
 
     ret_value = (H5FD_t*)file;
 
 done:
-    if (ret_value == NULL) {
-        if (handle != NULL) {
-            if (FAIL == H5FD_s3comms_s3r_close(handle)) {
-                HDONE_ERROR(H5E_VFL, H5E_CANTCLOSEFILE, NULL,
-                            "unable to close s3 file handle")
-            }
-        }
-        if (file != NULL) {
+    if(ret_value == NULL) {
+        if(handle != NULL)
+            if(FAIL == H5FD_s3comms_s3r_close(handle))
+                HDONE_ERROR(H5E_VFL, H5E_CANTCLOSEFILE, NULL, "unable to close s3 file handle")
+        if(file != NULL)
             file = H5FL_FREE(H5FD_ros3_t, file);
-        }
         curl_global_cleanup(); /* early cleanup because open failed */
     } /* end if null return value (error) */
 
     FUNC_LEAVE_NOAPI(ret_value)
-
-} /* end H5FD_ros3_open() */
+} /* end H5FD__ros3_open() */
 
 #if ROS3_STATS
-
 /*----------------------------------------------------------------------------
  *
  * Function: ros3_fprint_stats()
@@ -926,8 +862,7 @@ done:
  *----------------------------------------------------------------------------
  */
 static herr_t
-ros3_fprint_stats(FILE              *stream,
-                  const H5FD_ros3_t *file)
+ros3_fprint_stats(FILE *stream, const H5FD_ros3_t *file)
 {
     herr_t             ret_value    = SUCCEED;
     parsed_url_t      *purl         = NULL;
@@ -946,26 +881,16 @@ ros3_fprint_stats(FILE              *stream,
     unsigned           suffix_i     = 0;
     const char         suffixes[]   = { ' ', 'K', 'M', 'G', 'T', 'P' };
 
+    FUNC_ENTER_STATIC
 
-
-    FUNC_ENTER_NOAPI_NOINIT
-
-    if (stream == NULL) {
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
-                    "file stream cannot be null" );
-    }
-    if (file == NULL) {
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
-                    "file cannot be null");
-    }
-    if (file->s3r_handle == NULL) {
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
-                    "s3 request handle cannot be null");
-    }
-    if (file->s3r_handle->purl == NULL) {
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
-                    "parsed url structure cannot be null");
-    }
+    if(stream == NULL)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file stream cannot be null" );
+    if(file == NULL)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file cannot be null");
+    if(file->s3r_handle == NULL)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "s3 request handle cannot be null");
+    if(file->s3r_handle->purl == NULL)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "parsed url structure cannot be null");
     purl = file->s3r_handle->purl;
 
     /******************
@@ -973,9 +898,9 @@ ros3_fprint_stats(FILE              *stream,
      ******************/
 
     HDfprintf(stream, "stats for %s://%s", purl->scheme, purl->host);
-    if (purl->port != NULL && purl->port[0] != '\0')
+    if(purl->port != NULL && purl->port[0] != '\0')
         HDfprintf(stream, ":%s", purl->port);
-    if (purl->query != NULL && purl->query[0] != '\0') {
+    if(purl->query != NULL && purl->query[0] != '\0') {
         if (purl->path != NULL && purl->path[0] != '\0')
             HDfprintf(stream, "/%s", purl->path);
         else
@@ -990,23 +915,27 @@ ros3_fprint_stats(FILE              *stream,
      * AGGREGATE STATS *
      *******************/
 
-    for (i = 0; i <= ROS3_STATS_BIN_COUNT; i++) {
+    for(i = 0; i <= ROS3_STATS_BIN_COUNT; i++) {
         const ros3_statsbin *r = &file->raw[i];
         const ros3_statsbin *m = &file->meta[i];
 
-        if (m->min < min_meta)  min_meta = m->min;
-        if (r->min < min_raw)   min_raw  = r->min;
-        if (m->max > max_meta)  max_meta = m->max;
-        if (r->max > max_raw)   max_raw  = r->max;
+        if(m->min < min_meta)
+            min_meta = m->min;
+        if(r->min < min_raw)
+            min_raw  = r->min;
+        if(m->max > max_meta)
+            max_meta = m->max;
+        if(r->max > max_raw)
+            max_raw  = r->max;
 
         count_raw  += r->count;
         count_meta += m->count;
         bytes_raw  += r->bytes;
         bytes_meta += m->bytes;
     }
-    if (count_raw > 0)
+    if(count_raw > 0)
         average_raw = (double)bytes_raw / (double)count_raw;
-    if (count_meta > 0)
+    if(count_meta > 0)
         average_meta = (double)bytes_meta / (double)count_meta;
 
     /******************
@@ -1018,7 +947,7 @@ ros3_fprint_stats(FILE              *stream,
     HDfprintf(stream, "TOTAL BYTES: %llu  (%llu meta, %llu raw)\n",
               bytes_raw + bytes_meta, bytes_meta, bytes_raw);
 
-    if (count_raw + count_meta == 0)
+    if(count_raw + count_meta == 0)
         goto done;
 
     /*************************
@@ -1027,21 +956,21 @@ ros3_fprint_stats(FILE              *stream,
 
     HDfprintf(stream, "SIZES     meta      raw\n");
     HDfprintf(stream, "  min ");
-    if (count_meta == 0) {
+    if(count_meta == 0)
         HDfprintf(stream, "   0.000  ");
-    } else {
+    else {
         re_dub = (double)min_meta;
-        for (suffix_i = 0; re_dub >= 1024.0; suffix_i++)
+        for(suffix_i = 0; re_dub >= 1024.0; suffix_i++)
             re_dub /= 1024.0;
         HDassert(suffix_i < sizeof(suffixes));
         HDfprintf(stream, "%8.3lf%c ", re_dub, suffixes[suffix_i]);
     }
 
-    if (count_raw == 0) {
+    if(count_raw == 0)
         HDfprintf(stream, "   0.000 \n");
-    } else {
+    else {
         re_dub = (double)min_raw;
-        for (suffix_i = 0; re_dub >= 1024.0; suffix_i++)
+        for(suffix_i = 0; re_dub >= 1024.0; suffix_i++)
             re_dub /= 1024.0;
         HDassert(suffix_i < sizeof(suffixes));
         HDfprintf(stream, "%8.3lf%c\n", re_dub, suffixes[suffix_i]);
@@ -1049,26 +978,26 @@ ros3_fprint_stats(FILE              *stream,
 
     HDfprintf(stream, "  avg ");
     re_dub = (double)average_meta;
-    for (suffix_i = 0; re_dub >= 1024.0; suffix_i++)
+    for(suffix_i = 0; re_dub >= 1024.0; suffix_i++)
         re_dub /= 1024.0;
     HDassert(suffix_i < sizeof(suffixes));
     HDfprintf(stream, "%8.3lf%c ", re_dub, suffixes[suffix_i]);
 
     re_dub = (double)average_raw;
-    for (suffix_i = 0; re_dub >= 1024.0; suffix_i++)
+    for(suffix_i = 0; re_dub >= 1024.0; suffix_i++)
         re_dub /= 1024.0;
     HDassert(suffix_i < sizeof(suffixes));
     HDfprintf(stream, "%8.3lf%c\n", re_dub, suffixes[suffix_i]);
 
     HDfprintf(stream, "  max ");
     re_dub = (double)max_meta;
-    for (suffix_i = 0; re_dub >= 1024.0; suffix_i++)
+    for(suffix_i = 0; re_dub >= 1024.0; suffix_i++)
         re_dub /= 1024.0;
     HDassert(suffix_i < sizeof(suffixes));
     HDfprintf(stream, "%8.3lf%c ", re_dub, suffixes[suffix_i]);
 
     re_dub = (double)max_raw;
-    for (suffix_i = 0; re_dub >= 1024.0; suffix_i++)
+    for(suffix_i = 0; re_dub >= 1024.0; suffix_i++)
         re_dub /= 1024.0;
     HDassert(suffix_i < sizeof(suffixes));
     HDfprintf(stream, "%8.3lf%c\n", re_dub, suffixes[suffix_i]);
@@ -1082,7 +1011,7 @@ ros3_fprint_stats(FILE              *stream,
     HDfprintf(stream,
         "    up-to      meta     raw     meta      raw       meta      raw\n");
 
-    for (i = 0; i <= ROS3_STATS_BIN_COUNT; i++) {
+    for(i = 0; i <= ROS3_STATS_BIN_COUNT; i++) {
         const ros3_statsbin *m;
         const ros3_statsbin *r;
         unsigned long long   range_end = 0;
@@ -1097,46 +1026,46 @@ ros3_fprint_stats(FILE              *stream,
 
         m = &file->meta[i];
         r = &file->raw[i];
-        if (r->count == 0 && m->count == 0)
+        if(r->count == 0 && m->count == 0)
             continue;
 
         range_end = ros3_stats_boundaries[i];
 
-        if (i == ROS3_STATS_BIN_COUNT) {
+        if(i == ROS3_STATS_BIN_COUNT) {
             range_end = ros3_stats_boundaries[i-1];
             HDfprintf(stream, ">");
-        } else {
-            HDfprintf(stream, " ");
         }
+        else
+            HDfprintf(stream, " ");
 
         bm_val = (double)m->bytes;
-        for (suffix_i = 0; bm_val >= 1024.0; suffix_i++)
+        for(suffix_i = 0; bm_val >= 1024.0; suffix_i++)
             bm_val /= 1024.0;
         HDassert(suffix_i < sizeof(suffixes));
         bm_suffix = suffixes[suffix_i];
 
         br_val = (double)r->bytes;
-        for (suffix_i = 0; br_val >= 1024.0; suffix_i++)
+        for(suffix_i = 0; br_val >= 1024.0; suffix_i++)
             br_val /= 1024.0;
         HDassert(suffix_i < sizeof(suffixes));
         br_suffix = suffixes[suffix_i];
 
-        if (m->count > 0)
+        if(m->count > 0)
             am_val = (double)(m->bytes) / (double)(m->count);
-        for (suffix_i = 0; am_val >= 1024.0; suffix_i++)
+        for(suffix_i = 0; am_val >= 1024.0; suffix_i++)
             am_val /= 1024.0;
         HDassert(suffix_i < sizeof(suffixes));
         am_suffix = suffixes[suffix_i];
 
-        if (r->count > 0)
+        if(r->count > 0)
             ar_val = (double)(r->bytes) / (double)(r->count);
-        for (suffix_i = 0; ar_val >= 1024.0; suffix_i++)
+        for(suffix_i = 0; ar_val >= 1024.0; suffix_i++)
             ar_val /= 1024.0;
         HDassert(suffix_i < sizeof(suffixes));
         ar_suffix = suffixes[suffix_i];
 
         re_dub = (double)range_end;
-        for (suffix_i = 0; re_dub >= 1024.0; suffix_i++)
+        for(suffix_i = 0; re_dub >= 1024.0; suffix_i++)
             re_dub /= 1024.0;
         HDassert(suffix_i < sizeof(suffixes));
 
@@ -1150,7 +1079,7 @@ ros3_fprint_stats(FILE              *stream,
                   am_val, am_suffix,          /* metadata average */
                   ar_val, ar_suffix);         /* rawdata average  */
 
-        fflush(stream);
+        HDfflush(stream);
     }
 
 done:
@@ -1162,7 +1091,7 @@ done:
 
 /*-------------------------------------------------------------------------
  *
- * Function: H5FD_ros3_close()
+ * Function: H5FD__ros3_close()
  *
  * Purpose:
  *
@@ -1178,52 +1107,45 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_ros3_close(H5FD_t H5_ATTR_UNUSED *_file)
+H5FD__ros3_close(H5FD_t H5_ATTR_UNUSED *_file)
 {
     H5FD_ros3_t *file      = (H5FD_ros3_t *)_file;
     herr_t       ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5FD_ros3_close() called.\n");
+    HDfprintf(stdout, "H5FD__ros3_close() called.\n");
 #endif
 
-    /* Sanity checks
-     */
+    /* Sanity checks */
     HDassert(file != NULL);
     HDassert(file->s3r_handle != NULL);
 
     /* Close the underlying request handle
      */
-    if (FAIL == H5FD_s3comms_s3r_close(file->s3r_handle)) {
-        HGOTO_ERROR(H5E_VFL, H5E_CANTCLOSEFILE, FAIL,
-                    "unable to close S3 request handle")
-    }
+    if(FAIL == H5FD_s3comms_s3r_close(file->s3r_handle))
+        HGOTO_ERROR(H5E_VFL, H5E_CANTCLOSEFILE, FAIL, "unable to close S3 request handle")
 
 #if ROS3_STATS
     /* TODO: mechanism to re-target stats printout */
-    if (ros3_fprint_stats(stdout, file) == FAIL) {
-        HGOTO_ERROR(H5E_INTERNAL, H5E_ERROR, FAIL,
-                    "problem while writing file statistics")
-    }
+    if(ros3_fprint_stats(stdout, file) == FAIL)
+        HGOTO_ERROR(H5E_INTERNAL, H5E_ERROR, FAIL, "problem while writing file statistics")
 #endif /* ROS3_STATS */
 
-    /* Release the file info
-     */
+    /* Release the file info */
     file = H5FL_FREE(H5FD_ros3_t, file);
 
 done:
     curl_global_cleanup(); /* cleanup to answer init on open */
 
     FUNC_LEAVE_NOAPI(ret_value)
-
-} /* end H5FD_ros3_close() */
+} /* end H5FD__ros3_close() */
 
 
 /*-------------------------------------------------------------------------
  *
- * Function: H5FD_ros3_cmp()
+ * Function: H5FD__ros3_cmp()
  *
  * Purpose:
  *
@@ -1252,9 +1174,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static int
-H5FD_ros3_cmp(
-        const H5FD_t *_f1,
-        const H5FD_t *_f2)
+H5FD__ros3_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
 {
     const H5FD_ros3_t  *f1        = (const H5FD_ros3_t *)_f1;
     const H5FD_ros3_t  *f2        = (const H5FD_ros3_t *)_f2;
@@ -1262,10 +1182,10 @@ H5FD_ros3_cmp(
     const parsed_url_t *purl2     = NULL;
     int                 ret_value = 0;
 
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
+    FUNC_ENTER_STATIC_NOERR
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5FD_ros3_cmp() called.\n");
+    HDfprintf(stdout, "H5FD__ros3_cmp() called.\n");
 #endif
 
     HDassert(f1->s3r_handle != NULL);
@@ -1281,113 +1201,80 @@ H5FD_ros3_cmp(
     HDassert(purl2->host != NULL);
 
     /* URL: SCHEME */
-    if (HDstrcmp(purl1->scheme, purl2->scheme)) {
-        HGOTO_DONE(-1);
-    }
+    if(HDstrcmp(purl1->scheme, purl2->scheme))
+        HGOTO_DONE(-1)
 
     /* URL: HOST */
-    if (HDstrcmp(purl1->host, purl2->host)) {
-        HGOTO_DONE(-1);
-    }
+    if(HDstrcmp(purl1->host, purl2->host))
+        HGOTO_DONE(-1)
 
     /* URL: PORT */
-    if (purl1->port && purl2->port) {
-        if (HDstrcmp(purl1->port, purl2->port)) {
-            HGOTO_DONE(-1);
-        }
-    }
-    else
-    if (purl1->port) {
-        HGOTO_DONE(-1);
-    }
-    else
-    if (purl2->port) {
-        HGOTO_DONE(-1);
+    if(purl1->port && purl2->port) {
+        if(HDstrcmp(purl1->port, purl2->port))
+            HGOTO_DONE(-1)
     }
+    else if(purl1->port)
+        HGOTO_DONE(-1)
+    else if(purl2->port)
+        HGOTO_DONE(-1)
 
     /* URL: PATH */
-    if (purl1->path && purl2->path) {
-        if (HDstrcmp(purl1->path, purl2->path)) {
-            HGOTO_DONE(-1);
-        }
-    }
-    else
-    if (purl1->path && !purl2->path) {
-        HGOTO_DONE(-1);
-    }
-    else
-    if (purl2->path && !purl1->path) {
-        HGOTO_DONE(-1);
+    if(purl1->path && purl2->path) {
+        if(HDstrcmp(purl1->path, purl2->path))
+            HGOTO_DONE(-1)
     }
+    else if(purl1->path && !purl2->path)
+        HGOTO_DONE(-1)
+    else if(purl2->path && !purl1->path)
+        HGOTO_DONE(-1)
 
     /* URL: QUERY */
-    if (purl1->query && purl2->query) {
-        if (HDstrcmp(purl1->query, purl2->query)) {
-            HGOTO_DONE(-1);
-        }
-    }
-    else
-    if (purl1->query && !purl2->query) {
-        HGOTO_DONE(-1);
-    }
-    else
-    if (purl2->query && !purl1->query) {
-        HGOTO_DONE(-1);
+    if(purl1->query && purl2->query) {
+        if(HDstrcmp(purl1->query, purl2->query))
+            HGOTO_DONE(-1)
     }
+    else if(purl1->query && !purl2->query)
+        HGOTO_DONE(-1)
+    else if(purl2->query && !purl1->query)
+        HGOTO_DONE(-1)
 
     /* FAPL: AWS_REGION */
-    if (f1->fa.aws_region[0] != '\0' && f2->fa.aws_region[0] != '\0') {
-        if (HDstrcmp(f1->fa.aws_region, f2->fa.aws_region)) {
-            HGOTO_DONE(-1);
-        }
-    }
-    else
-    if (f1->fa.aws_region[0] != '\0') {
-        HGOTO_DONE(-1);
-    }
-    else
-    if (f2->fa.aws_region[0] != '\0') {
-        HGOTO_DONE(-1);
+    if(f1->fa.aws_region[0] != '\0' && f2->fa.aws_region[0] != '\0') {
+        if(HDstrcmp(f1->fa.aws_region, f2->fa.aws_region))
+            HGOTO_DONE(-1)
     }
+    else if(f1->fa.aws_region[0] != '\0')
+        HGOTO_DONE(-1)
+    else if(f2->fa.aws_region[0] != '\0')
+        HGOTO_DONE(-1)
 
     /* FAPL: SECRET_ID */
-    if (f1->fa.secret_id[0] != '\0' && f2->fa.secret_id[0] != '\0') {
-        if (HDstrcmp(f1->fa.secret_id, f2->fa.secret_id)) {
-            HGOTO_DONE(-1);
-        }
-    }
-    else
-    if (f1->fa.secret_id[0] != '\0') {
-        HGOTO_DONE(-1);
-    }
-    else
-    if (f2->fa.secret_id[0] != '\0') {
-        HGOTO_DONE(-1);
+    if(f1->fa.secret_id[0] != '\0' && f2->fa.secret_id[0] != '\0') {
+        if(HDstrcmp(f1->fa.secret_id, f2->fa.secret_id))
+            HGOTO_DONE(-1)
     }
+    else if(f1->fa.secret_id[0] != '\0')
+        HGOTO_DONE(-1)
+    else if(f2->fa.secret_id[0] != '\0')
+        HGOTO_DONE(-1)
 
     /* FAPL: SECRET_KEY */
-    if (f1->fa.secret_key[0] != '\0' && f2->fa.secret_key[0] != '\0') {
-        if (HDstrcmp(f1->fa.secret_key, f2->fa.secret_key)) {
-            HGOTO_DONE(-1);
-        }
-    }
-    else
-    if (f1->fa.secret_key[0] != '\0') {
-        HGOTO_DONE(-1);
-    }
-    else
-    if (f2->fa.secret_key[0] != '\0') {
-        HGOTO_DONE(-1);
+    if(f1->fa.secret_key[0] != '\0' && f2->fa.secret_key[0] != '\0') {
+        if(HDstrcmp(f1->fa.secret_key, f2->fa.secret_key))
+            HGOTO_DONE(-1)
     }
+    else if(f1->fa.secret_key[0] != '\0')
+        HGOTO_DONE(-1)
+    else if(f2->fa.secret_key[0] != '\0')
+        HGOTO_DONE(-1)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-
-} /* H5FD_ros3_cmp() */
+} /* H5FD__ros3_cmp() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5FD_ros3_query
+ * Function:    H5FD__ros3_query
  *
  * Purpose:     Set the flags that this VFL driver is capable of supporting.
  *              (listed in H5FDpublic.h)
@@ -1406,30 +1293,28 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_ros3_query(const H5FD_t H5_ATTR_UNUSED *_file,
-                unsigned long *flags /* out */)
+H5FD__ros3_query(const H5FD_t H5_ATTR_UNUSED *_file, unsigned long *flags)
 {
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
+    FUNC_ENTER_STATIC_NOERR
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5FD_ros3_query() called.\n");
+    HDfprintf(stdout, "H5FD__ros3_query() called.\n");
 #endif
 
     /* Set the VFL feature flags that this driver supports */
-    if (flags) {
+    if(flags) {
         *flags = 0;
         /* OK to perform data sieving for faster raw data reads & writes */
         *flags |= H5FD_FEAT_DATA_SIEVE;
     } /* end if */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-
-} /* H5FD_ros3_query() */
+} /* H5FD__ros3_query() */
 
 
 /*-------------------------------------------------------------------------
  *
- * Function: H5FD_ros3_get_eoa()
+ * Function: H5FD__ros3_get_eoa()
  *
  * Purpose:
  *
@@ -1447,25 +1332,23 @@ H5FD_ros3_query(const H5FD_t H5_ATTR_UNUSED *_file,
  *-------------------------------------------------------------------------
  */
 static haddr_t
-H5FD_ros3_get_eoa(const H5FD_t                *_file,
-                  H5FD_mem_t   H5_ATTR_UNUSED  type)
+H5FD__ros3_get_eoa(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
 {
     const H5FD_ros3_t *file = (const H5FD_ros3_t *)_file;
 
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
+    FUNC_ENTER_STATIC_NOERR
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5FD_ros3_get_eoa() called.\n");
+    HDfprintf(stdout, "H5FD__ros3_get_eoa() called.\n");
 #endif
 
     FUNC_LEAVE_NOAPI(file->eoa)
-
-} /* end H5FD_ros3_get_eoa() */
+} /* end H5FD__ros3_get_eoa() */
 
 
 /*-------------------------------------------------------------------------
  *
- * Function: H5FD_ros3_set_eoa()
+ * Function: H5FD__ros3_set_eoa()
  *
  * Purpose:
  *
@@ -1481,28 +1364,25 @@ H5FD_ros3_get_eoa(const H5FD_t                *_file,
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_ros3_set_eoa(H5FD_t                    *_file,
-                  H5FD_mem_t H5_ATTR_UNUSED  type,
-                  haddr_t                    addr)
+H5FD__ros3_set_eoa(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t addr)
 {
     H5FD_ros3_t *file = (H5FD_ros3_t *)_file;
 
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
+    FUNC_ENTER_STATIC_NOERR
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5FD_ros3_set_eoa() called.\n");
+    HDfprintf(stdout, "H5FD__ros3_set_eoa() called.\n");
 #endif
 
     file->eoa = addr;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-
-} /* H5FD_ros3_set_eoa() */
+} /* H5FD__ros3_set_eoa() */
 
 
 /*-------------------------------------------------------------------------
  *
- * Function: H5FD_ros3_get_eof()
+ * Function: H5FD__ros3_get_eof()
  *
  * Purpose:
  *
@@ -1519,25 +1399,23 @@ H5FD_ros3_set_eoa(H5FD_t                    *_file,
  *-------------------------------------------------------------------------
  */
 static haddr_t
-H5FD_ros3_get_eof(const H5FD_t                *_file,
-                  H5FD_mem_t   H5_ATTR_UNUSED  type)
+H5FD__ros3_get_eof(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
 {
     const H5FD_ros3_t *file = (const H5FD_ros3_t *)_file;
 
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
+    FUNC_ENTER_STATIC_NOERR
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5FD_ros3_get_eof() called.\n");
+    HDfprintf(stdout, "H5FD__ros3_get_eof() called.\n");
 #endif
 
     FUNC_LEAVE_NOAPI(H5FD_s3comms_s3r_get_filesize(file->s3r_handle))
-
-} /* end H5FD_ros3_get_eof() */
+} /* end H5FD__ros3_get_eof() */
 
 
 /*-------------------------------------------------------------------------
  *
- * Function: H5FD_ros3_get_handle()
+ * Function: H5FD__ros3_get_handle()
  *
  * Purpose:
  *
@@ -1553,34 +1431,31 @@ H5FD_ros3_get_eof(const H5FD_t                *_file,
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_ros3_get_handle(H5FD_t                *_file,
-                     hid_t H5_ATTR_UNUSED   fapl,
-                     void                 **file_handle)
+H5FD__ros3_get_handle(H5FD_t *_file, hid_t H5_ATTR_UNUSED fapl,
+    void **file_handle)
 {
     H5FD_ros3_t *file      = (H5FD_ros3_t *)_file;
     herr_t       ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5FD_ros3_get_handle() called.\n");
+    HDfprintf(stdout, "H5FD__ros3_get_handle() called.\n");
 #endif
 
-    if (!file_handle) {
+    if(!file_handle)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file handle not valid")
-    }
 
     *file_handle = file->s3r_handle;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-
-} /* end H5FD_ros3_get_handle() */
+} /* end H5FD__ros3_get_handle() */
 
 
 /*-------------------------------------------------------------------------
  *
- * Function: H5FD_ros3_read()
+ * Function: H5FD__ros3_read()
  *
  * Purpose
  *
@@ -1601,12 +1476,9 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_ros3_read(H5FD_t                    *_file,
-               H5FD_mem_t H5_ATTR_UNUSED  type,
-               hid_t      H5_ATTR_UNUSED  dxpl_id,
-               haddr_t                    addr, /* start offset   */
-               size_t                     size, /* length of read */
-               void                      *buf)  /* out            */
+H5FD__ros3_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type,
+    hid_t H5_ATTR_UNUSED dxpl_id, haddr_t addr, size_t size,
+    void *buf)
 {
     H5FD_ros3_t *file      = (H5FD_ros3_t *)_file;
     size_t       filesize  = 0;
@@ -1618,10 +1490,10 @@ H5FD_ros3_read(H5FD_t                    *_file,
 #endif /* ROS3_STATS */
 
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5FD_ros3_read() called.\n");
+    HDfprintf(stdout, "H5FD__ros3_read() called.\n");
 #endif
 
     HDassert(file != NULL);
@@ -1630,40 +1502,32 @@ H5FD_ros3_read(H5FD_t                    *_file,
 
     filesize = H5FD_s3comms_s3r_get_filesize(file->s3r_handle);
 
-    if ((addr > filesize) || ((addr + size) > filesize)) {
+    if((addr > filesize) || ((addr + size) > filesize))
         HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "range exceeds file address")
-    }
 
-    if (H5FD_s3comms_s3r_read(file->s3r_handle, addr, size, buf) == FAIL) {
+    if(H5FD_s3comms_s3r_read(file->s3r_handle, addr, size, buf) == FAIL)
         HGOTO_ERROR(H5E_VFL, H5E_READERROR, FAIL, "unable to execute read")
-    }
 
 #if ROS3_STATS
 
-    /* Find which "bin" this read fits in. Can be "overflow" bin.
-     */
-    for (bin_i = 0; bin_i < ROS3_STATS_BIN_COUNT; bin_i++) {
-        if ((unsigned long long)size < ros3_stats_boundaries[bin_i]) {
+    /* Find which "bin" this read fits in. Can be "overflow" bin.  */
+    for(bin_i = 0; bin_i < ROS3_STATS_BIN_COUNT; bin_i++)
+        if((unsigned long long)size < ros3_stats_boundaries[bin_i])
             break;
-        }
-    }
     bin = (type == H5FD_MEM_DRAW)
         ? &file->raw[bin_i]
         : &file->meta[bin_i];
 
-    /* Store collected stats in appropriate bin
-     */
-    if (bin->count == 0) {
+    /* Store collected stats in appropriate bin */
+    if(bin->count == 0) {
         bin->min = size;
         bin->max = size;
     }
     else {
-        if (size < bin->min) {
+        if(size < bin->min)
             bin->min = size;
-        }
-        if (size > bin->max) {
+        if(size > bin->max)
             bin->max = size;
-        }
     }
     bin->count++;
     bin->bytes += (unsigned long long)size;
@@ -1672,13 +1536,12 @@ H5FD_ros3_read(H5FD_t                    *_file,
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-
-} /* end H5FD_ros3_read() */
+} /* end H5FD__ros3_read() */
 
 
 /*-------------------------------------------------------------------------
  *
- * Function: H5FD_ros3_write()
+ * Function: H5FD__ros3_write()
  *
  * Purpose:
  *
@@ -1695,33 +1558,28 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_ros3_write(H5FD_t     H5_ATTR_UNUSED *_file,
-                H5FD_mem_t H5_ATTR_UNUSED  type,
-                hid_t      H5_ATTR_UNUSED  dxpl_id,
-                haddr_t    H5_ATTR_UNUSED  addr,
-                size_t     H5_ATTR_UNUSED  size,
-                const void H5_ATTR_UNUSED *buf)
+H5FD__ros3_write(H5FD_t H5_ATTR_UNUSED *_file, H5FD_mem_t H5_ATTR_UNUSED type,
+    hid_t H5_ATTR_UNUSED dxpl_id, haddr_t H5_ATTR_UNUSED addr,
+    size_t H5_ATTR_UNUSED size, const void H5_ATTR_UNUSED *buf)
 {
     herr_t ret_value = FAIL;
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5FD_ros3_write() called.\n");
+    HDfprintf(stdout, "H5FD__ros3_write() called.\n");
 #endif
 
-    HGOTO_ERROR(H5E_VFL, H5E_UNSUPPORTED, FAIL,
-                "cannot write to read-only file.")
+    HGOTO_ERROR(H5E_VFL, H5E_UNSUPPORTED, FAIL, "cannot write to read-only file.")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-
-} /* H5FD_ros3_write() */
+} /* H5FD__ros3_write() */
 
 
 /*-------------------------------------------------------------------------
  *
- * Function: H5FD_ros3_truncate()
+ * Function: H5FD__ros3_truncate()
  *
  * Purpose:
  *
@@ -1740,30 +1598,27 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_ros3_truncate(H5FD_t  H5_ATTR_UNUSED *_file,
-                   hid_t   H5_ATTR_UNUSED  dxpl_id,
-                   hbool_t H5_ATTR_UNUSED  closing)
+H5FD__ros3_truncate(H5FD_t H5_ATTR_UNUSED *_file, hid_t H5_ATTR_UNUSED dxpl_id,
+    hbool_t H5_ATTR_UNUSED closing)
 {
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
 #if ROS3_DEBUG
-    HDfprintf(stdout, "H5FD_ros3_truncate() called.\n");
+    HDfprintf(stdout, "H5FD__ros3_truncate() called.\n");
 #endif
 
-    HGOTO_ERROR(H5E_VFL, H5E_UNSUPPORTED, FAIL,
-                "cannot truncate read-only file.")
+    HGOTO_ERROR(H5E_VFL, H5E_UNSUPPORTED, FAIL, "cannot truncate read-only file.")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-
-} /* end H5FD_ros3_truncate() */
+} /* end H5FD__ros3_truncate() */
 
 
 /*-------------------------------------------------------------------------
  *
- * Function: H5FD_ros3_lock()
+ * Function: H5FD__ros3_lock()
  *
  * Purpose:
  *
@@ -1783,18 +1638,18 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_ros3_lock(H5FD_t  H5_ATTR_UNUSED *_file,
+H5FD__ros3_lock(H5FD_t  H5_ATTR_UNUSED *_file,
                hbool_t H5_ATTR_UNUSED  rw)
 {
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
-    FUNC_LEAVE_NOAPI(SUCCEED)
+    FUNC_ENTER_STATIC_NOERR
 
-} /* end H5FD_ros3_lock() */
+    FUNC_LEAVE_NOAPI(SUCCEED)
+} /* end H5FD__ros3_lock() */
 
 
 /*-------------------------------------------------------------------------
  *
- * Function: H5FD_ros3_unlock()
+ * Function: H5FD__ros3_unlock()
  *
  * Purpose:
  *
@@ -1811,12 +1666,12 @@ H5FD_ros3_lock(H5FD_t  H5_ATTR_UNUSED *_file,
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_ros3_unlock(H5FD_t H5_ATTR_UNUSED *_file)
+H5FD__ros3_unlock(H5FD_t H5_ATTR_UNUSED *_file)
 {
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
-    FUNC_LEAVE_NOAPI(SUCCEED)
+    FUNC_ENTER_STATIC_NOERR
 
-} /* end H5FD_ros3_unlock() */
+    FUNC_LEAVE_NOAPI(SUCCEED)
+} /* end H5FD__ros3_unlock() */
 
 #endif /* H5_HAVE_ROS3_VFD */