Normalization with develop (mainly VFDs)

1 files changed, 260 insertions, 259 deletions

diff --git a/src/H5FDfamily.c b/src/H5FDfamily.c
index 9ffecf9..8817c47 100644
--- a/src/H5FDfamily.c
+++ b/src/H5FDfamily.c
@@ -34,15 +34,15 @@
 
 #include "H5FDdrvr_module.h" /* This source code file is part of the H5FD driver module */
 
-#include "H5private.h"   /* Generic Functions			*/
+#include "H5private.h"   /* Generic Functions            */
 #include "H5CXprivate.h" /* API Contexts                         */
-#include "H5Eprivate.h"  /* Error handling		  	*/
-#include "H5Fprivate.h"  /* File access				*/
-#include "H5FDprivate.h" /* File drivers				*/
-#include "H5FDfamily.h"  /* Family file driver 			*/
-#include "H5Iprivate.h"  /* IDs			  		*/
-#include "H5MMprivate.h" /* Memory management			*/
-#include "H5Pprivate.h"  /* Property lists			*/
+#include "H5Eprivate.h"  /* Error handling              */
+#include "H5Fprivate.h"  /* File access                */
+#include "H5FDprivate.h" /* File drivers                */
+#include "H5FDfamily.h"  /* Family file driver             */
+#include "H5Iprivate.h"  /* IDs                      */
+#include "H5MMprivate.h" /* Memory management            */
+#include "H5Pprivate.h"  /* Property lists            */
 
 /* The size of the member name buffers */
 #define H5FD_FAM_MEMB_NAME_BUF_SIZE 4096
@@ -52,16 +52,16 @@ static hid_t H5FD_FAMILY_g = 0;
 
 /* The description of a file belonging to this driver. */
 typedef struct H5FD_family_t {
-    H5FD_t   pub;          /*public stuff, must be first		*/
-    hid_t    memb_fapl_id; /*file access property list for members	*/
-    hsize_t  memb_size;    /*actual size of each member file	*/
-    hsize_t  pmem_size;    /*member size passed in from property	*/
-    unsigned nmembs;       /*number of family members		*/
-    unsigned amembs;       /*number of member slots allocated	*/
-    H5FD_t **memb;         /*dynamic array of member pointers	*/
-    haddr_t  eoa;          /*end of allocated addresses		*/
-    char *   name;         /*name generator printf format		*/
-    unsigned flags;        /*flags for opening additional members	*/
+    H5FD_t   pub;          /*public stuff, must be first        */
+    hid_t    memb_fapl_id; /*file access property list for members    */
+    hsize_t  memb_size;    /*actual size of each member file    */
+    hsize_t  pmem_size;    /*member size passed in from property    */
+    unsigned nmembs;       /*number of family members        */
+    unsigned amembs;       /*number of member slots allocated    */
+    H5FD_t **memb;         /*dynamic array of member pointers    */
+    haddr_t  eoa;          /*end of allocated addresses        */
+    char *   name;         /*name generator printf format        */
+    unsigned flags;        /*flags for opening additional members    */
 
     /* Information from properties set by 'h5repart' tool */
     hsize_t mem_newsize;    /*new member size passed in as private
@@ -73,70 +73,70 @@ typedef struct H5FD_family_t {
 
 /* Driver-specific file access properties */
 typedef struct H5FD_family_fapl_t {
-    hsize_t memb_size;    /*size of each member			*/
+    hsize_t memb_size;    /*size of each member            */
     hid_t   memb_fapl_id; /*file access property list of each memb*/
 } H5FD_family_fapl_t;
 
 /* Callback prototypes */
-static herr_t  H5FD_family_term(void);
-static void *  H5FD_family_fapl_get(H5FD_t *_file);
-static void *  H5FD_family_fapl_copy(const void *_old_fa);
-static herr_t  H5FD_family_fapl_free(void *_fa);
-static hsize_t H5FD_family_sb_size(H5FD_t *_file);
-static herr_t  H5FD_family_sb_encode(H5FD_t *_file, char *name /*out*/, unsigned char *buf /*out*/);
-static herr_t  H5FD_family_sb_decode(H5FD_t *_file, const char *name, const unsigned char *buf);
-static H5FD_t *H5FD_family_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr);
-static herr_t  H5FD_family_close(H5FD_t *_file);
-static int     H5FD_family_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
-static herr_t  H5FD_family_query(const H5FD_t *_f1, unsigned long *flags);
-static haddr_t H5FD_family_get_eoa(const H5FD_t *_file, H5FD_mem_t type);
-static herr_t  H5FD_family_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t eoa);
-static haddr_t H5FD_family_get_eof(const H5FD_t *_file, H5FD_mem_t type);
-static herr_t  H5FD_family_get_handle(H5FD_t *_file, hid_t fapl, void **file_handle);
-static herr_t  H5FD_family_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size,
-                                void *_buf /*out*/);
-static herr_t  H5FD_family_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size,
-                                 const void *_buf);
-static herr_t  H5FD_family_flush(H5FD_t *_file, hid_t dxpl_id, hbool_t closing);
-static herr_t  H5FD_family_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing);
-static herr_t  H5FD_family_lock(H5FD_t *_file, hbool_t rw);
-static herr_t  H5FD_family_unlock(H5FD_t *_file);
+static herr_t  H5FD__family_term(void);
+static void *  H5FD__family_fapl_get(H5FD_t *_file);
+static void *  H5FD__family_fapl_copy(const void *_old_fa);
+static herr_t  H5FD__family_fapl_free(void *_fa);
+static hsize_t H5FD__family_sb_size(H5FD_t *_file);
+static herr_t  H5FD__family_sb_encode(H5FD_t *_file, char *name /*out*/, unsigned char *buf /*out*/);
+static herr_t  H5FD__family_sb_decode(H5FD_t *_file, const char *name, const unsigned char *buf);
+static H5FD_t *H5FD__family_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr);
+static herr_t  H5FD__family_close(H5FD_t *_file);
+static int     H5FD__family_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
+static herr_t  H5FD__family_query(const H5FD_t *_f1, unsigned long *flags);
+static haddr_t H5FD__family_get_eoa(const H5FD_t *_file, H5FD_mem_t type);
+static herr_t  H5FD__family_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t eoa);
+static haddr_t H5FD__family_get_eof(const H5FD_t *_file, H5FD_mem_t type);
+static herr_t  H5FD__family_get_handle(H5FD_t *_file, hid_t fapl, void **file_handle);
+static herr_t  H5FD__family_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size,
+                                 void *_buf /*out*/);
+static herr_t  H5FD__family_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size,
+                                  const void *_buf);
+static herr_t  H5FD__family_flush(H5FD_t *_file, hid_t dxpl_id, hbool_t closing);
+static herr_t  H5FD__family_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing);
+static herr_t  H5FD__family_lock(H5FD_t *_file, hbool_t rw);
+static herr_t  H5FD__family_unlock(H5FD_t *_file);
 
 /* The class struct */
 static const H5FD_class_t H5FD_family_g = {
-    "family",                   /*name			*/
-    HADDR_MAX,                  /*maxaddr		*/
-    H5F_CLOSE_WEAK,             /*fc_degree		*/
-    H5FD_family_term,           /*terminate             */
-    H5FD_family_sb_size,        /*sb_size		*/
-    H5FD_family_sb_encode,      /*sb_encode		*/
-    H5FD_family_sb_decode,      /*sb_decode		*/
-    sizeof(H5FD_family_fapl_t), /*fapl_size		*/
-    H5FD_family_fapl_get,       /*fapl_get		*/
-    H5FD_family_fapl_copy,      /*fapl_copy		*/
-    H5FD_family_fapl_free,      /*fapl_free		*/
-    0,                          /*dxpl_size		*/
-    NULL,                       /*dxpl_copy		*/
-    NULL,                       /*dxpl_free		*/
-    H5FD_family_open,           /*open			*/
-    H5FD_family_close,          /*close			*/
-    H5FD_family_cmp,            /*cmp			*/
-    H5FD_family_query,          /*query			*/
-    NULL,                       /*get_type_map		*/
-    NULL,                       /*alloc			*/
-    NULL,                       /*free			*/
-    H5FD_family_get_eoa,        /*get_eoa		*/
-    H5FD_family_set_eoa,        /*set_eoa		*/
-    H5FD_family_get_eof,        /*get_eof		*/
-    H5FD_family_get_handle,     /*get_handle            */
-    H5FD_family_read,           /*read			*/
-    H5FD_family_write,          /*write			*/
-    H5FD_family_flush,          /*flush			*/
-    H5FD_family_truncate,       /*truncate		*/
-    H5FD_family_lock,           /*lock                  */
-    H5FD_family_unlock,         /*unlock                */
+    "family",                   /* name                 */
+    HADDR_MAX,                  /* maxaddr              */
+    H5F_CLOSE_WEAK,             /* fc_degree            */
+    H5FD__family_term,          /* terminate            */
+    H5FD__family_sb_size,       /* sb_size              */
+    H5FD__family_sb_encode,     /* sb_encode            */
+    H5FD__family_sb_decode,     /* sb_decode            */
+    sizeof(H5FD_family_fapl_t), /* fapl_size            */
+    H5FD__family_fapl_get,      /* fapl_get             */
+    H5FD__family_fapl_copy,     /* fapl_copy            */
+    H5FD__family_fapl_free,     /* fapl_free            */
+    0,                          /* dxpl_size            */
+    NULL,                       /* dxpl_copy            */
+    NULL,                       /* dxpl_free            */
+    H5FD__family_open,          /* open                 */
+    H5FD__family_close,         /* close                */
+    H5FD__family_cmp,           /* cmp                  */
+    H5FD__family_query,         /* query                */
+    NULL,                       /* get_type_map         */
+    NULL,                       /* alloc                */
+    NULL,                       /* free                 */
+    H5FD__family_get_eoa,       /* get_eoa              */
+    H5FD__family_set_eoa,       /* set_eoa              */
+    H5FD__family_get_eof,       /* get_eof              */
+    H5FD__family_get_handle,    /* get_handle           */
+    H5FD__family_read,          /* read                 */
+    H5FD__family_write,         /* write                */
+    H5FD__family_flush,         /* flush                */
+    H5FD__family_truncate,      /* truncate             */
+    H5FD__family_lock,          /* lock                 */
+    H5FD__family_unlock,        /* unlock               */
     NULL,                       /*dedup                 */
-    H5FD_FLMAP_DICHOTOMY        /*fl_map                */
+    H5FD_FLMAP_DICHOTOMY        /* fl_map               */
 };
 
 /*--------------------------------------------------------------------------
@@ -197,9 +197,9 @@ done:
 } /* H5FD_family_init() */
 
 /*---------------------------------------------------------------------------
- * Function:	H5FD_family_term
+ * Function:    H5FD__family_term
  *
- * Purpose:	Shut down the VFD
+ * Purpose:    Shut down the VFD
  *
  * Returns:     Non-negative on success or negative on failure
  *
@@ -209,30 +209,30 @@ done:
  *---------------------------------------------------------------------------
  */
 static herr_t
-H5FD_family_term(void)
+H5FD__family_term(void)
 {
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
+    FUNC_ENTER_STATIC_NOERR
 
     /* Reset VFL ID */
     H5FD_FAMILY_g = 0;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5FD_family_term() */
+} /* end H5FD__family_term() */
 
 /*-------------------------------------------------------------------------
- * Function:	H5Pset_fapl_family
+ * Function:    H5Pset_fapl_family
  *
- * Purpose:	Sets the file access property list FAPL_ID to use the family
- *		driver. The MEMB_SIZE is the size in bytes of each file
- *		member (used only when creating a new file) and the
- *		MEMB_FAPL_ID is a file access property list to be used for
- *		each family member.
+ * Purpose:    Sets the file access property list FAPL_ID to use the family
+ *        driver. The MEMB_SIZE is the size in bytes of each file
+ *        member (used only when creating a new file) and the
+ *        MEMB_FAPL_ID is a file access property list to be used for
+ *        each family member.
  *
- * Return:	Success:	Non-negative
+ * Return:    Success:    Non-negative
  *
- *		Failure:	Negative
+ *            Failure:    Negative
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
  *
  *-------------------------------------------------------------------------
@@ -268,16 +268,16 @@ done:
 }
 
 /*-------------------------------------------------------------------------
- * Function:	H5Pget_fapl_family
+ * Function:    H5Pget_fapl_family
  *
- * Purpose:	Returns information about the family file access property
- *		list though the function arguments.
+ * Purpose:    Returns information about the family file access property
+ *             list though the function arguments.
  *
- * Return:	Success:	Non-negative
+ * Return:    Success:    Non-negative
  *
- *		Failure:	Negative
+ *            Failure:    Negative
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
  *
  *-------------------------------------------------------------------------
@@ -311,29 +311,29 @@ done:
 }
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD_family_fapl_get
+ * Function:    H5FD__family_fapl_get
  *
- * Purpose:	Gets a file access property list which could be used to
- *		create an identical file.
+ * Purpose:    Gets a file access property list which could be used to
+ *             create an identical file.
  *
- * Return:	Success:	Ptr to new file access property list.
+ * Return:    Success:    Ptr to new file access property list.
  *
- *		Failure:	NULL
+ *            Failure:    NULL
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Friday, August 13, 1999
  *
  *-------------------------------------------------------------------------
  */
 static void *
-H5FD_family_fapl_get(H5FD_t *_file)
+H5FD__family_fapl_get(H5FD_t *_file)
 {
     H5FD_family_t *     file = (H5FD_family_t *)_file;
     H5FD_family_fapl_t *fa   = NULL;
     H5P_genplist_t *    plist;            /* Property list pointer */
     void *              ret_value = NULL; /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
     if (NULL == (fa = (H5FD_family_fapl_t *)H5MM_calloc(sizeof(H5FD_family_fapl_t))))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
@@ -347,36 +347,36 @@ H5FD_family_fapl_get(H5FD_t *_file)
     ret_value = fa;
 
 done:
-    if (ret_value == NULL) {
+    if (ret_value == NULL)
         if (fa != NULL)
             H5MM_xfree(fa);
-    } /* end if */
+
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD_family_fapl_copy
+ * Function:    H5FD__family_fapl_copy
  *
- * Purpose:	Copies the family-specific file access properties.
+ * Purpose:    Copies the family-specific file access properties.
  *
- * Return:	Success:	Ptr to a new property list
+ * Return:    Success:    Ptr to a new property list
  *
- *		Failure:	NULL
+ *            Failure:    NULL
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
  *
  *-------------------------------------------------------------------------
  */
 static void *
-H5FD_family_fapl_copy(const void *_old_fa)
+H5FD__family_fapl_copy(const void *_old_fa)
 {
     const H5FD_family_fapl_t *old_fa = (const H5FD_family_fapl_t *)_old_fa;
     H5FD_family_fapl_t *      new_fa = NULL;
     H5P_genplist_t *          plist;            /* Property list pointer */
     void *                    ret_value = NULL; /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
     if (NULL == (new_fa = (H5FD_family_fapl_t *)H5MM_malloc(sizeof(H5FD_family_fapl_t))))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
@@ -399,34 +399,34 @@ H5FD_family_fapl_copy(const void *_old_fa)
     ret_value = new_fa;
 
 done:
-    if (ret_value == NULL) {
+    if (ret_value == NULL)
         if (new_fa != NULL)
             H5MM_xfree(new_fa);
-    } /* end if */
+
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD_family_fapl_free
+ * Function:    H5FD__family_fapl_free
  *
- * Purpose:	Frees the family-specific file access properties.
+ * Purpose:    Frees the family-specific file access properties.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	-1
+ *            Failure:    -1
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
  *
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_family_fapl_free(void *_fa)
+H5FD__family_fapl_free(void *_fa)
 {
     H5FD_family_fapl_t *fa        = (H5FD_family_fapl_t *)_fa;
     herr_t              ret_value = SUCCEED; /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
     if (H5I_dec_ref(fa->memb_fapl_id) < 0)
         HGOTO_ERROR(H5E_VFL, H5E_CANTDEC, FAIL, "can't close driver ID")
@@ -437,24 +437,24 @@ done:
 }
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD_family_sb_size
+ * Function:    H5FD__family_sb_size
  *
- * Purpose:	Returns the size of the private information to be stored in
- *		the superblock.
+ * Purpose:    Returns the size of the private information to be stored in
+ *        the superblock.
  *
- * Return:	Success:	The super block driver data size.
+ * Return:    Success:    The super block driver data size.
  *
- *		Failure:	never fails
+ *            Failure:    never fails
  *
- * Programmer:	Raymond Lu
+ * Programmer:    Raymond Lu
  *              Tuesday, May 10, 2005
  *
  *-------------------------------------------------------------------------
  */
 static hsize_t
-H5FD_family_sb_size(H5FD_t H5_ATTR_UNUSED *_file)
+H5FD__family_sb_size(H5FD_t H5_ATTR_UNUSED *_file)
 {
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
+    FUNC_ENTER_STATIC_NOERR
 
     /* 8 bytes field for the size of member file size field should be
      * enough for now. */
@@ -462,29 +462,29 @@ H5FD_family_sb_size(H5FD_t H5_ATTR_UNUSED *_file)
 }
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD_family_sb_encode
+ * Function:    H5FD__family_sb_encode
  *
- * Purpose:	Encode driver information for the superblock. The NAME
- *		argument is a nine-byte buffer which will be initialized with
- *		an eight-character name/version number and null termination.
+ * Purpose:    Encode driver information for the superblock. The NAME
+ *        argument is a nine-byte buffer which will be initialized with
+ *        an eight-character name/version number and null termination.
  *
- *		The encoding is the member file size and name template.
+ *        The encoding is the member file size and name template.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	-1
+ *            Failure:    -1
  *
- * Programmer:	Raymond Lu
+ * Programmer:    Raymond Lu
  *              Tuesday, May 10, 2005
  *
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_family_sb_encode(H5FD_t *_file, char *name /*out*/, unsigned char *buf /*out*/)
+H5FD__family_sb_encode(H5FD_t *_file, char *name /*out*/, unsigned char *buf /*out*/)
 {
     H5FD_family_t *file = (H5FD_family_t *)_file;
 
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
+    FUNC_ENTER_STATIC_NOERR
 
     /* Name and version number */
     HDstrncpy(name, "NCSAfami", (size_t)9);
@@ -494,41 +494,41 @@ H5FD_family_sb_encode(H5FD_t *_file, char *name /*out*/, unsigned char *buf /*ou
      * This is to guarantee backward compatibility.  If a file is created with
      * v1.6 library and the driver info isn't saved in the superblock.  We open
      * it with v1.8, the FILE->MEMB_SIZE will be the actual size of the first
-     * member file (see H5FD_family_open).  So it isn't safe to use FILE->MEMB_SIZE.
+     * member file (see H5FD__family_open).  So it isn't safe to use FILE->MEMB_SIZE.
      * If the file is created with v1.8, the correctness of FILE->PMEM_SIZE is
-     * checked in H5FD_family_sb_decode. SLU - 2009/3/21
+     * checked in H5FD__family_sb_decode. SLU - 2009/3/21
      */
     UINT64ENCODE(buf, (uint64_t)file->pmem_size);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5FD_family_sb_encode() */
+} /* end H5FD__family_sb_encode() */
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD_family_sb_decode
+ * Function:    H5FD__family_sb_decode
  *
- * Purpose:	This function has 2 separate purpose.  One is to decodes the
+ * Purpose:     This function has 2 separate purpose.  One is to decodes the
  *              superblock information for this driver. The NAME argument is
  *              the eight-character (plus null termination) name stored in i
  *              the file.  The FILE argument is updated according to the
  *              information in the superblock.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	-1
+ *            Failure:    -1
  *
- * Programmer:	Raymond Lu
+ * Programmer:    Raymond Lu
  *              Tuesday, May 10, 2005
  *
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_family_sb_decode(H5FD_t *_file, const char H5_ATTR_UNUSED *name, const unsigned char *buf)
+H5FD__family_sb_decode(H5FD_t *_file, const char H5_ATTR_UNUSED *name, const unsigned char *buf)
 {
     H5FD_family_t *file = (H5FD_family_t *)_file;
     uint64_t       msize;
     herr_t         ret_value = SUCCEED; /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
     /* Read member file size. Skip name template for now although it's saved. */
     UINT64DECODE(buf, msize);
@@ -557,20 +557,20 @@ H5FD_family_sb_decode(H5FD_t *_file, const char H5_ATTR_UNUSED *name, const unsi
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5FD_family_sb_decode() */
+} /* end H5FD__family_sb_decode() */
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD_family_open
+ * Function:    H5FD__family_open
  *
- * Purpose:	Creates and/or opens a family of files as an HDF5 file.
+ * Purpose:    Creates and/or opens a family of files as an HDF5 file.
  *
- * Return:	Success:	A pointer to a new file dat structure. The
- *				public fields will be initialized by the
- *				caller, which is always H5FD_open().
+ * Return:    Success:    A pointer to a new file dat structure. The
+ *                public fields will be initialized by the
+ *                caller, which is always H5FD_open().
  *
- *		Failure:	NULL
+ *            Failure:    NULL
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
  *
  *-------------------------------------------------------------------------
@@ -583,7 +583,7 @@ done:
  */
 H5_GCC_DIAG_OFF("format-nonliteral")
 static H5FD_t *
-H5FD_family_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
+H5FD__family_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
 {
     H5FD_family_t *file      = NULL;
     char *         memb_name = NULL, *temp = NULL;
@@ -591,7 +591,7 @@ H5FD_family_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxadd
     unsigned       t_flags   = flags & ~H5F_ACC_CREAT;
     H5FD_t *       ret_value = NULL;
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
     /* Check arguments */
     if (!name || !*name)
@@ -733,34 +733,34 @@ done:
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5FD_family_open() */
+} /* end H5FD__family_open() */
 H5_GCC_DIAG_ON("format-nonliteral")
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD_family_close
+ * Function:    H5FD__family_close
  *
- * Purpose:	Closes a family of files.
+ * Purpose:    Closes a family of files.
  *
- * Return:	Success:	Non-negative
+ * Return:    Success:    Non-negative
  *
- *		Failure:	Negative with as many members closed as
- *				possible. The only subsequent operation
- *				permitted on the file is a close operation.
+ *            Failure:    Negative with as many members closed as
+ *                possible. The only subsequent operation
+ *                permitted on the file is a close operation.
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
  *
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_family_close(H5FD_t *_file)
+H5FD__family_close(H5FD_t *_file)
 {
     H5FD_family_t *file    = (H5FD_family_t *)_file;
     unsigned       nerrors = 0;         /* Number of errors while closing member files */
     unsigned       u;                   /* Local index variable */
     herr_t         ret_value = SUCCEED; /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
     /* Close as many members as possible. Use private function here to avoid clearing
      * the error stack. We need the error message to indicate wrong member file size. */
@@ -785,32 +785,32 @@ H5FD_family_close(H5FD_t *_file)
     H5MM_xfree(file);
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5FD_family_close() */
+} /* end H5FD__family_close() */
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD_family_cmp
+ * Function:    H5FD__family_cmp
  *
- * Purpose:	Compares two file families to see if they are the same. It
- *		does this by comparing the first member of the two families.
+ * Purpose:    Compares two file families to see if they are the same. It
+ *        does this by comparing the first member of the two families.
  *
- * Return:	Success:	like strcmp()
+ * Return:    Success:    like strcmp()
  *
- *		Failure:	never fails (arguments were checked by the
- *				caller).
+ *            Failure:    never fails (arguments were checked by the
+ *                caller).
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
  *
  *-------------------------------------------------------------------------
  */
 static int
-H5FD_family_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
+H5FD__family_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
 {
     const H5FD_family_t *f1        = (const H5FD_family_t *)_f1;
     const H5FD_family_t *f2        = (const H5FD_family_t *)_f2;
     int                  ret_value = 0;
 
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
+    FUNC_ENTER_STATIC_NOERR
 
     HDassert(f1->nmembs >= 1 && f1->memb[0]);
     HDassert(f2->nmembs >= 1 && f2->memb[0]);
@@ -818,28 +818,28 @@ H5FD_family_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
     ret_value = H5FDcmp(f1->memb[0], f2->memb[0]);
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5FD_family_cmp() */
+} /* end H5FD__family_cmp() */
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD_family_query
+ * Function:    H5FD__family_query
  *
- * Purpose:	Set the flags that this VFL driver is capable of supporting.
+ * Purpose:    Set the flags that this VFL driver is capable of supporting.
  *              (listed in H5FDpublic.h)
  *
- * Return:	Success:	non-negative
- *		Failure:	negative
+ * Return:    Success:    non-negative
+ *            Failure:    negative
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Friday, August 25, 2000
  *
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_family_query(const H5FD_t *_file, unsigned long *flags /* out */)
+H5FD__family_query(const H5FD_t *_file, unsigned long *flags /* out */)
 {
     const H5FD_family_t *file = (const H5FD_family_t *)_file; /* Family VFD info */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
+    FUNC_ENTER_STATIC_NOERR
 
     /* Set the VFL feature flags that this driver supports */
     if (flags) {
@@ -856,44 +856,44 @@ H5FD_family_query(const H5FD_t *_file, unsigned long *flags /* out */)
     }                                                /* end if */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5FD_family_query() */
+} /* end H5FD__family_query() */
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD_family_get_eoa
+ * Function:    H5FD__family_get_eoa
  *
- * Purpose:	Returns the end-of-address marker for the file. The EOA
- *		marker is the first address past the last byte allocated in
- *		the format address space.
+ * Purpose:    Returns the end-of-address marker for the file. The EOA
+ *        marker is the first address past the last byte allocated in
+ *        the format address space.
  *
- * Return:	Success:	The end-of-address-marker
+ * Return:    Success:    The end-of-address-marker
  *
- *		Failure:	HADDR_UNDEF
+ *            Failure:    HADDR_UNDEF
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
  *
  *-------------------------------------------------------------------------
  */
 static haddr_t
-H5FD_family_get_eoa(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
+H5FD__family_get_eoa(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
 {
     const H5FD_family_t *file = (const H5FD_family_t *)_file;
 
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
+    FUNC_ENTER_STATIC_NOERR
 
     FUNC_LEAVE_NOAPI(file->eoa)
 }
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD_family_set_eoa
+ * Function:    H5FD__family_set_eoa
  *
- * Purpose:	Set the end-of-address marker for the file.
+ * Purpose:    Set the end-of-address marker for the file.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	-1
+ *            Failure:    -1
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
  *
  *-------------------------------------------------------------------------
@@ -906,7 +906,7 @@ H5FD_family_get_eoa(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
  */
 H5_GCC_DIAG_OFF("format-nonliteral")
 static herr_t
-H5FD_family_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t abs_eoa)
+H5FD__family_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t abs_eoa)
 {
     H5FD_family_t *file      = (H5FD_family_t *)_file;
     haddr_t        addr      = abs_eoa;
@@ -914,7 +914,7 @@ H5FD_family_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t abs_eoa)
     unsigned       u;                   /* Local index variable */
     herr_t         ret_value = SUCCEED; /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
     /* Allocate space for the member name buffer */
     if (NULL == (memb_name = (char *)H5MM_malloc(H5FD_FAM_MEMB_NAME_BUF_SIZE)))
@@ -976,31 +976,31 @@ done:
 H5_GCC_DIAG_ON("format-nonliteral")
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD_family_get_eof
+ * Function:    H5FD__family_get_eof
  *
- * Purpose:	Returns the end-of-file marker, which is the greater of
- *		either the total family size or the current EOA marker.
+ * Purpose:    Returns the end-of-file marker, which is the greater of
+ *        either the total family size or the current EOA marker.
  *
- * Return:	Success:	End of file address, the first address past
- *				the end of the family of files or the current
- *				EOA, whichever is larger.
+ * Return:    Success:    End of file address, the first address past
+ *                the end of the family of files or the current
+ *                EOA, whichever is larger.
  *
- *		Failure:      	HADDR_UNDEF
+ *            Failure:          HADDR_UNDEF
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
  *
  *-------------------------------------------------------------------------
  */
 static haddr_t
-H5FD_family_get_eof(const H5FD_t *_file, H5FD_mem_t type)
+H5FD__family_get_eof(const H5FD_t *_file, H5FD_mem_t type)
 {
     const H5FD_family_t *file = (const H5FD_family_t *)_file;
     haddr_t              eof  = 0;
     int                  i;                       /* Local index variable */
     haddr_t              ret_value = HADDR_UNDEF; /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
+    FUNC_ENTER_STATIC_NOERR
 
     /*
      * Find the last member that has a non-zero EOF and break out of the loop
@@ -1031,7 +1031,7 @@ H5FD_family_get_eof(const H5FD_t *_file, H5FD_mem_t type)
 }
 
 /*-------------------------------------------------------------------------
- * Function:       H5FD_family_get_handle
+ * Function:       H5FD__family_get_handle
  *
  * Purpose:        Returns the file handle of FAMILY file driver.
  *
@@ -1043,7 +1043,7 @@ H5FD_family_get_eof(const H5FD_t *_file, H5FD_mem_t type)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_family_get_handle(H5FD_t *_file, hid_t fapl, void **file_handle)
+H5FD__family_get_handle(H5FD_t *_file, hid_t fapl, void **file_handle)
 {
     H5FD_family_t * file = (H5FD_family_t *)_file;
     H5P_genplist_t *plist;
@@ -1051,7 +1051,7 @@ H5FD_family_get_handle(H5FD_t *_file, hid_t fapl, void **file_handle)
     int             memb;
     herr_t          ret_value = FAIL; /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
     /* Get the plist structure and family offset */
     if (NULL == (plist = H5P_object_verify(fapl, H5P_FILE_ACCESS)))
@@ -1070,24 +1070,25 @@ done:
 }
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD_family_read
+ * Function:    H5FD__family_read
  *
- * Purpose:	Reads SIZE bytes of data from FILE beginning at address ADDR
- *		into buffer BUF according to data transfer properties in
- *		DXPL_ID.
+ * Purpose:    Reads SIZE bytes of data from FILE beginning at address ADDR
+ *        into buffer BUF according to data transfer properties in
+ *        DXPL_ID.
  *
- * Return:	Success:	Zero. Result is stored in caller-supplied
- *				buffer BUF.
+ * Return:    Success:    Zero. Result is stored in caller-supplied
+ *                buffer BUF.
  *
- *		Failure:	-1, contents of buffer BUF are undefined.
+ *            Failure:    -1, contents of buffer BUF are undefined.
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
  *
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_family_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size, void *_buf /*out*/)
+H5FD__family_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size,
+                  void *_buf /*out*/)
 {
     H5FD_family_t * file = (H5FD_family_t *)_file;
     unsigned char * buf  = (unsigned char *)_buf;
@@ -1098,7 +1099,7 @@ H5FD_family_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, si
     H5P_genplist_t *plist;               /* Property list pointer */
     herr_t          ret_value = SUCCEED; /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
     /*
      * Get the member data transfer property list. If the transfer property
@@ -1136,23 +1137,23 @@ done:
 }
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD_family_write
+ * Function:    H5FD__family_write
  *
- * Purpose:	Writes SIZE bytes of data to FILE beginning at address ADDR
- *		from buffer BUF according to data transfer properties in
- *		DXPL_ID.
+ * Purpose:    Writes SIZE bytes of data to FILE beginning at address ADDR
+ *        from buffer BUF according to data transfer properties in
+ *        DXPL_ID.
  *
- * Return:	Success:	Zero
+ * Return:    Success:    Zero
  *
- *		Failure:	-1
+ *            Failure:    -1
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
  *
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_family_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size, const void *_buf)
+H5FD__family_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size, const void *_buf)
 {
     H5FD_family_t *      file = (H5FD_family_t *)_file;
     const unsigned char *buf  = (const unsigned char *)_buf;
@@ -1163,7 +1164,7 @@ H5FD_family_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, s
     H5P_genplist_t *     plist;               /* Property list pointer */
     herr_t               ret_value = SUCCEED; /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
     /*
      * Get the member data transfer property list. If the transfer property
@@ -1201,26 +1202,26 @@ done:
 }
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD_family_flush
+ * Function:    H5FD__family_flush
  *
- * Purpose:	Flushes all family members.
+ * Purpose:    Flushes all family members.
  *
- * Return:	Success:	0
- *		Failure:	-1, as many files flushed as possible.
+ * Return:    Success:    0
+ *            Failure:    -1, as many files flushed as possible.
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
  *
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_family_flush(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t closing)
+H5FD__family_flush(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t closing)
 {
     H5FD_family_t *file = (H5FD_family_t *)_file;
     unsigned       u, nerrors = 0;
     herr_t         ret_value = SUCCEED; /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
     for (u = 0; u < file->nmembs; u++)
         if (file->memb[u] && H5FD_flush(file->memb[u], closing) < 0)
@@ -1231,30 +1232,30 @@ H5FD_family_flush(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t closing)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5FD_family_flush() */
+} /* end H5FD__family_flush() */
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD_family_truncate
+ * Function:    H5FD__family_truncate
  *
- * Purpose:	Truncates all family members.
+ * Purpose:    Truncates all family members.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	-1, as many files truncated as possible.
+ *            Failure:    -1, as many files truncated as possible.
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Saturday, February 23, 2008
  *
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_family_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t closing)
+H5FD__family_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t closing)
 {
     H5FD_family_t *file = (H5FD_family_t *)_file;
     unsigned       u, nerrors = 0;
     herr_t         ret_value = SUCCEED; /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
     for (u = 0; u < file->nmembs; u++)
         if (file->memb[u] && H5FD_truncate(file->memb[u], closing) < 0)
@@ -1265,10 +1266,10 @@ H5FD_family_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t closin
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5FD_family_truncate() */
+} /* end H5FD__family_truncate() */
 
 /*-------------------------------------------------------------------------
- * Function:    H5FD_family_lock
+ * Function:    H5FD__family_lock
  *
  * Purpose:     To place an advisory lock on a file.
  *              The lock type to apply depends on the parameter "rw":
@@ -1282,13 +1283,13 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_family_lock(H5FD_t *_file, hbool_t rw)
+H5FD__family_lock(H5FD_t *_file, hbool_t rw)
 {
     H5FD_family_t *file = (H5FD_family_t *)_file; /* VFD file struct */
     unsigned       u;                             /* Local index variable */
     herr_t         ret_value = SUCCEED;           /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
     /* Place the lock on all the member files */
     for (u = 0; u < file->nmembs; u++)
@@ -1312,10 +1313,10 @@ H5FD_family_lock(H5FD_t *_file, hbool_t rw)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5FD_family_lock() */
+} /* end H5FD__family_lock() */
 
 /*-------------------------------------------------------------------------
- * Function:    H5FD_family_unlock
+ * Function:    H5FD__family_unlock
  *
  * Purpose:     To remove the existing lock on the file
  *
@@ -1326,13 +1327,13 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_family_unlock(H5FD_t *_file)
+H5FD__family_unlock(H5FD_t *_file)
 {
     H5FD_family_t *file = (H5FD_family_t *)_file; /* VFD file struct */
     unsigned       u;                             /* Local index variable */
     herr_t         ret_value = SUCCEED;           /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
     /* Remove the lock on the member files */
     for (u = 0; u < file->nmembs; u++)
@@ -1342,4 +1343,4 @@ H5FD_family_unlock(H5FD_t *_file)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5FD_family_unlock() */
+} /* end H5FD__family_unlock() */