Normalization of object header code

1 files changed, 27 insertions, 27 deletions

diff --git a/src/H5Oefl.c b/src/H5Oefl.c
index 5ec85aa..1ecaf36 100644
--- a/src/H5Oefl.c
+++ b/src/H5Oefl.c
@@ -26,11 +26,11 @@
 #include "H5Opkg.h"      /* Object headers			*/
 
 /* PRIVATE PROTOTYPES */
-static void * H5O_efl_decode(H5F_t *f, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, size_t p_size,
-                             const uint8_t *p);
-static herr_t H5O_efl_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg);
-static void * H5O_efl_copy(const void *_mesg, void *_dest);
-static size_t H5O_efl_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg);
+static void * H5O__efl_decode(H5F_t *f, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags, size_t p_size,
+                              const uint8_t *p);
+static herr_t H5O__efl_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg);
+static void * H5O__efl_copy(const void *_mesg, void *_dest);
+static size_t H5O__efl_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg);
 static herr_t H5O__efl_reset(void *_mesg);
 static void * H5O__efl_copy_file(H5F_t *file_src, void *mesg_src, H5F_t *file_dst, hbool_t *recompute_size,
                                  unsigned *mesg_flags, H5O_copy_t *cpy_info, void *udata);
@@ -42,10 +42,10 @@ const H5O_msg_class_t H5O_MSG_EFL[1] = {{
     "external file list", /*message name for debugging    */
     sizeof(H5O_efl_t),    /*native message size	    	*/
     0,                    /* messages are sharable?       */
-    H5O_efl_decode,       /*decode message		*/
-    H5O_efl_encode,       /*encode message		*/
-    H5O_efl_copy,         /*copy native value		*/
-    H5O_efl_size,         /*size of message on disk	*/
+    H5O__efl_decode,      /*decode message		*/
+    H5O__efl_encode,      /*encode message		*/
+    H5O__efl_copy,        /*copy native value		*/
+    H5O__efl_size,        /*size of message on disk	*/
     H5O__efl_reset,       /*reset method		    	*/
     NULL,                 /* free method			*/
     NULL,                 /* file delete method		*/
@@ -63,7 +63,7 @@ const H5O_msg_class_t H5O_MSG_EFL[1] = {{
 #define H5O_EFL_VERSION 1
 
 /*-------------------------------------------------------------------------
- * Function:    H5O_efl_decode
+ * Function:    H5O__efl_decode
  *
  * Purpose:	Decode an external file list message and return a pointer to
  *          the message (and some other data).
@@ -83,8 +83,8 @@ const H5O_msg_class_t H5O_MSG_EFL[1] = {{
  *-------------------------------------------------------------------------
  */
 static void *
-H5O_efl_decode(H5F_t *f, H5O_t H5_ATTR_UNUSED *open_oh, unsigned H5_ATTR_UNUSED mesg_flags,
-               unsigned H5_ATTR_UNUSED *ioflags, size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
+H5O__efl_decode(H5F_t *f, H5O_t H5_ATTR_UNUSED *open_oh, unsigned H5_ATTR_UNUSED mesg_flags,
+                unsigned H5_ATTR_UNUSED *ioflags, size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
 {
     H5O_efl_t * mesg = NULL;
     int         version;
@@ -93,7 +93,7 @@ H5O_efl_decode(H5F_t *f, H5O_t H5_ATTR_UNUSED *open_oh, unsigned H5_ATTR_UNUSED
     size_t      u;                /* Local index variable */
     void *      ret_value = NULL; /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
     /* Check args */
     HDassert(f);
@@ -172,10 +172,10 @@ done:
             H5MM_xfree(mesg);
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5O_efl_decode() */
+} /* end H5O__efl_decode() */
 
 /*-------------------------------------------------------------------------
- * Function:	H5O_efl_encode
+ * Function:	H5O__efl_encode
  *
  * Purpose:	Encodes a message.
  *
@@ -187,12 +187,12 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_efl_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, const void *_mesg)
+H5O__efl_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, const void *_mesg)
 {
     const H5O_efl_t *mesg = (const H5O_efl_t *)_mesg;
     size_t           u; /* Local index variable */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
+    FUNC_ENTER_STATIC_NOERR
 
     /* check args */
     HDassert(f);
@@ -230,10 +230,10 @@ H5O_efl_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, cons
     } /* end for */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5O_efl_encode() */
+} /* end H5O__efl_encode() */
 
 /*-------------------------------------------------------------------------
- * Function:	H5O_efl_copy
+ * Function:	H5O__efl_copy
  *
  * Purpose:	Copies a message from _MESG to _DEST, allocating _DEST if
  *		necessary.
@@ -248,7 +248,7 @@ H5O_efl_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, cons
  *-------------------------------------------------------------------------
  */
 static void *
-H5O_efl_copy(const void *_mesg, void *_dest)
+H5O__efl_copy(const void *_mesg, void *_dest)
 {
     const H5O_efl_t *mesg = (const H5O_efl_t *)_mesg;
     H5O_efl_t *      dest = (H5O_efl_t *)_dest;
@@ -256,7 +256,7 @@ H5O_efl_copy(const void *_mesg, void *_dest)
     hbool_t          slot_allocated = FALSE; /* Flag to indicate that dynamic allocation has begun */
     void *           ret_value      = NULL;  /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
     /* check args */
     HDassert(mesg);
@@ -296,10 +296,10 @@ done:
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5O_efl_copy() */
+} /* end H5O__efl_copy() */
 
 /*-------------------------------------------------------------------------
- * Function:	H5O_efl_size
+ * Function:	H5O__efl_size
  *
  * Purpose:	Returns the size of the raw message in bytes not counting the
  *		message type or size fields, but only the data fields.	This
@@ -316,12 +316,12 @@ done:
  *-------------------------------------------------------------------------
  */
 static size_t
-H5O_efl_size(const H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, const void *_mesg)
+H5O__efl_size(const H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, const void *_mesg)
 {
     const H5O_efl_t *mesg      = (const H5O_efl_t *)_mesg;
     size_t           ret_value = 0;
 
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
+    FUNC_ENTER_STATIC_NOERR
 
     /* check args */
     HDassert(f);
@@ -336,7 +336,7 @@ H5O_efl_size(const H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, const void *
                                (size_t)H5F_SIZEOF_SIZE(f)); /*file size	*/
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5O_efl_size() */
+} /* end H5O__efl_size() */
 
 /*-------------------------------------------------------------------------
  * Function:	H5O__efl_reset
@@ -396,7 +396,7 @@ H5O_efl_total_size(H5O_efl_t *efl)
 {
     hsize_t ret_value = 0, tmp;
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_NOAPI(0)
 
     if (efl->nused > 0 && H5O_EFL_UNLIMITED == efl->slot[efl->nused - 1].size)
         ret_value = H5O_EFL_UNLIMITED;