Normalization of object header code

1 files changed, 55 insertions, 55 deletions

diff --git a/src/H5Opline.c b/src/H5Opline.c
index 64dd610..221e323 100644
--- a/src/H5Opline.c
+++ b/src/H5Opline.c
@@ -22,68 +22,68 @@
 #define H5Z_FRIEND     /*suppress error about including H5Zpkg      */
 
 #include "H5private.h"   /* Generic Functions            */
-#include "H5Dprivate.h"  /* Datasets                */
-#include "H5Eprivate.h"  /* Error handling              */
-#include "H5FLprivate.h" /* Free Lists                */
+#include "H5Dprivate.h"  /* Datasets                     */
+#include "H5Eprivate.h"  /* Error handling               */
+#include "H5FLprivate.h" /* Free Lists                   */
 #include "H5MMprivate.h" /* Memory management            */
-#include "H5Opkg.h"      /* Object headers            */
-#include "H5Zpkg.h"      /* Data filters                */
+#include "H5Opkg.h"      /* Object headers               */
+#include "H5Zpkg.h"      /* Data filters                 */
 
 /* PRIVATE PROTOTYPES */
-static herr_t H5O_pline_encode(H5F_t *f, uint8_t *p, const void *mesg);
+static herr_t H5O__pline_encode(H5F_t *f, uint8_t *p, const void *mesg);
 static void * H5O__pline_decode(H5F_t *f, H5O_t *open_oh, unsigned mesg_flags, unsigned *ioflags,
                                 size_t p_size, const uint8_t *p);
-static void * H5O_pline_copy(const void *_mesg, void *_dest);
-static size_t H5O_pline_size(const H5F_t *f, const void *_mesg);
+static void * H5O__pline_copy(const void *_mesg, void *_dest);
+static size_t H5O__pline_size(const H5F_t *f, const void *_mesg);
 static herr_t H5O__pline_reset(void *_mesg);
 static herr_t H5O__pline_free(void *_mesg);
-static herr_t H5O_pline_pre_copy_file(H5F_t *file_src, const void *mesg_src, hbool_t *deleted,
-                                      const H5O_copy_t *cpy_info, void *_udata);
+static herr_t H5O__pline_pre_copy_file(H5F_t *file_src, const void *mesg_src, hbool_t *deleted,
+                                       const H5O_copy_t *cpy_info, void *_udata);
 static herr_t H5O__pline_debug(H5F_t *f, const void *_mesg, FILE *stream, int indent, int fwidth);
 
 /* Set up & include shared message "interface" info */
 #define H5O_SHARED_TYPE        H5O_MSG_PLINE
-#define H5O_SHARED_DECODE      H5O_pline_shared_decode
+#define H5O_SHARED_DECODE      H5O__pline_shared_decode
 #define H5O_SHARED_DECODE_REAL H5O__pline_decode
-#define H5O_SHARED_ENCODE      H5O_pline_shared_encode
-#define H5O_SHARED_ENCODE_REAL H5O_pline_encode
-#define H5O_SHARED_SIZE        H5O_pline_shared_size
-#define H5O_SHARED_SIZE_REAL   H5O_pline_size
+#define H5O_SHARED_ENCODE      H5O__pline_shared_encode
+#define H5O_SHARED_ENCODE_REAL H5O__pline_encode
+#define H5O_SHARED_SIZE        H5O__pline_shared_size
+#define H5O_SHARED_SIZE_REAL   H5O__pline_size
 #define H5O_SHARED_DELETE      H5O__pline_shared_delete
 #undef H5O_SHARED_DELETE_REAL
 #define H5O_SHARED_LINK H5O__pline_shared_link
 #undef H5O_SHARED_LINK_REAL
 #define H5O_SHARED_COPY_FILE H5O__pline_shared_copy_file
 #undef H5O_SHARED_COPY_FILE_REAL
-#define H5O_SHARED_POST_COPY_FILE H5O_pline_shared_post_copy_file
+#define H5O_SHARED_POST_COPY_FILE H5O__pline_shared_post_copy_file
 #undef H5O_SHARED_POST_COPY_FILE_REAL
 #undef H5O_SHARED_POST_COPY_FILE_UPD
-#define H5O_SHARED_DEBUG      H5O_pline_shared_debug
+#define H5O_SHARED_DEBUG      H5O__pline_shared_debug
 #define H5O_SHARED_DEBUG_REAL H5O__pline_debug
 #include "H5Oshared.h" /* Shared Object Header Message Callbacks */
 
 /* This message derives from H5O message class */
 const H5O_msg_class_t H5O_MSG_PLINE[1] = {{
-    H5O_PLINE_ID,                              /* message id number        */
-    "filter pipeline",                         /* message name for debugging    */
-    sizeof(H5O_pline_t),                       /* native message size        */
+    H5O_PLINE_ID,                              /* message id number            */
+    "filter pipeline",                         /* message name for debugging   */
+    sizeof(H5O_pline_t),                       /* native message size          */
     H5O_SHARE_IS_SHARABLE | H5O_SHARE_IN_OHDR, /* messages are sharable?       */
-    H5O_pline_shared_decode,                   /* decode message        */
-    H5O_pline_shared_encode,                   /* encode message        */
-    H5O_pline_copy,                            /* copy the native value    */
-    H5O_pline_shared_size,                     /* size of raw message        */
-    H5O__pline_reset,                          /* reset method            */
-    H5O__pline_free,                           /* free method            */
-    H5O__pline_shared_delete,                  /* file delete method        */
-    H5O__pline_shared_link,                    /* link method            */
-    NULL,                                      /* set share method        */
-    NULL,                                      /*can share method        */
-    H5O_pline_pre_copy_file,                   /* pre copy native value to file */
+    H5O__pline_shared_decode,                  /* decode message               */
+    H5O__pline_shared_encode,                  /* encode message               */
+    H5O__pline_copy,                           /* copy the native value        */
+    H5O__pline_shared_size,                    /* size of raw message          */
+    H5O__pline_reset,                          /* reset method                 */
+    H5O__pline_free,                           /* free method                  */
+    H5O__pline_shared_delete,                  /* file delete method           */
+    H5O__pline_shared_link,                    /* link method                  */
+    NULL,                                      /* set share method             */
+    NULL,                                      /*can share method              */
+    H5O__pline_pre_copy_file,                  /* pre copy native value to file */
     H5O__pline_shared_copy_file,               /* copy native value to file    */
-    H5O_pline_shared_post_copy_file,           /* post copy native value to file    */
-    NULL,                                      /* get creation index        */
-    NULL,                                      /* set creation index        */
-    H5O_pline_shared_debug                     /* debug the message        */
+    H5O__pline_shared_post_copy_file,          /* post copy native value to file */
+    NULL,                                      /* get creation index           */
+    NULL,                                      /* set creation index           */
+    H5O__pline_shared_debug                    /* debug the message            */
 }};
 
 /* Format version bounds for filter pipleline */
@@ -101,7 +101,7 @@ H5FL_DEFINE(H5O_pline_t);
 /*-------------------------------------------------------------------------
  * Function:    H5O__pline_decode
  *
- * Purpose:    Decodes a filter pipeline message.
+ * Purpose:     Decodes a filter pipeline message.
  *
  * Return:      Success:    Ptr to the native message.
  *              Failure:    NULL
@@ -242,7 +242,7 @@ done:
 } /* end H5O__pline_decode() */
 
 /*-------------------------------------------------------------------------
- * Function:    H5O_pline_encode
+ * Function:    H5O__pline_encode
  *
  * Purpose:    Encodes message MESG into buffer P.
  *
@@ -254,13 +254,13 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_pline_encode(H5F_t H5_ATTR_UNUSED *f, uint8_t *p /*out*/, const void *mesg)
+H5O__pline_encode(H5F_t H5_ATTR_UNUSED *f, uint8_t *p /*out*/, const void *mesg)
 {
     const H5O_pline_t *      pline = (const H5O_pline_t *)mesg; /* Pipeline message to encode */
     const H5Z_filter_info_t *filter;                            /* Filter to encode */
     size_t                   i, j;                              /* Local index variables */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
+    FUNC_ENTER_STATIC_NOERR
 
     /* Check args */
     HDassert(p);
@@ -336,10 +336,10 @@ H5O_pline_encode(H5F_t H5_ATTR_UNUSED *f, uint8_t *p /*out*/, const void *mesg)
     } /* end for */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5O_pline_encode() */
+} /* end H5O__pline_encode() */
 
 /*-------------------------------------------------------------------------
- * Function:    H5O_pline_copy
+ * Function:    H5O__pline_copy
  *
  * Purpose:    Copies a filter pipeline message from SRC to DST allocating
  *        DST if necessary.  If DST is already allocated then we assume
@@ -355,14 +355,14 @@ H5O_pline_encode(H5F_t H5_ATTR_UNUSED *f, uint8_t *p /*out*/, const void *mesg)
  *-------------------------------------------------------------------------
  */
 static void *
-H5O_pline_copy(const void *_src, void *_dst /*out*/)
+H5O__pline_copy(const void *_src, void *_dst /*out*/)
 {
     const H5O_pline_t *src = (const H5O_pline_t *)_src; /* Source pipeline message */
     H5O_pline_t *      dst = (H5O_pline_t *)_dst;       /* Destination pipeline message */
     size_t             i;                               /* Local index variable */
     H5O_pline_t *      ret_value = NULL;                /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
     /* Allocate pipeline message, if not provided */
     if (!dst && NULL == (dst = H5FL_MALLOC(H5O_pline_t)))
@@ -430,10 +430,10 @@ done:
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5O_pline_copy() */
+} /* end H5O__pline_copy() */
 
 /*-------------------------------------------------------------------------
- * Function:    H5O_pline_size
+ * Function:    H5O__pline_size
  *
  * Purpose:    Determines the size of a raw filter pipeline message.
  *
@@ -447,13 +447,13 @@ done:
  *-------------------------------------------------------------------------
  */
 static size_t
-H5O_pline_size(const H5F_t H5_ATTR_UNUSED *f, const void *mesg)
+H5O__pline_size(const H5F_t H5_ATTR_UNUSED *f, const void *mesg)
 {
     const H5O_pline_t *pline = (const H5O_pline_t *)mesg; /* Pipeline message */
     size_t             i;                                 /* Local index variable */
     size_t             ret_value = 0;                     /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
+    FUNC_ENTER_STATIC_NOERR
 
     /* Message header */
     ret_value = (size_t)(1 +                                               /*version            */
@@ -471,7 +471,7 @@ H5O_pline_size(const H5F_t H5_ATTR_UNUSED *f, const void *mesg)
         else {
             H5Z_class2_t *cls; /* Filter class */
 
-            /* Get the name of the filter, same as done with H5O_pline_encode() */
+            /* Get the name of the filter, same as done with H5O__pline_encode() */
             if (NULL == (name = pline->filter[i].name) && (cls = H5Z_find(pline->filter[i].id)))
                 name = cls->name;
             name_len = name ? HDstrlen(name) + 1 : 0;
@@ -494,7 +494,7 @@ H5O_pline_size(const H5F_t H5_ATTR_UNUSED *f, const void *mesg)
     } /* end for */
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5O_pline_size() */
+} /* end H5O__pline_size() */
 
 /*-------------------------------------------------------------------------
  * Function:    H5O__pline_reset
@@ -575,7 +575,7 @@ H5O__pline_free(void *mesg)
 } /* end H5O__pline_free() */
 
 /*-------------------------------------------------------------------------
- * Function:    H5O_pline_pre_copy_file
+ * Function:    H5O__pline_pre_copy_file
  *
  * Purpose:     Perform any necessary actions before copying message between
  *              files
@@ -590,14 +590,14 @@ H5O__pline_free(void *mesg)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_pline_pre_copy_file(H5F_t H5_ATTR_UNUSED *file_src, const void *mesg_src, hbool_t H5_ATTR_UNUSED *deleted,
-                        const H5O_copy_t *cpy_info, void *_udata)
+H5O__pline_pre_copy_file(H5F_t H5_ATTR_UNUSED *file_src, const void *mesg_src,
+                         hbool_t H5_ATTR_UNUSED *deleted, const H5O_copy_t *cpy_info, void *_udata)
 {
     const H5O_pline_t *        pline_src = (const H5O_pline_t *)mesg_src;       /* Source pline */
     H5O_copy_file_ud_common_t *udata     = (H5O_copy_file_ud_common_t *)_udata; /* Object copying user data */
     herr_t                     ret_value = SUCCEED;                             /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
     /* check args */
     HDassert(pline_src);
@@ -614,12 +614,12 @@ H5O_pline_pre_copy_file(H5F_t H5_ATTR_UNUSED *file_src, const void *mesg_src, hb
      * the object copying process.
      */
     if (udata)
-        if (NULL == (udata->src_pline = (H5O_pline_t *)H5O_pline_copy(pline_src, NULL)))
+        if (NULL == (udata->src_pline = (H5O_pline_t *)H5O__pline_copy(pline_src, NULL)))
             HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "unable to copy")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5O_pline_pre_copy_file() */
+} /* end H5O__pline_pre_copy_file() */
 
 /*-------------------------------------------------------------------------
  * Function:    H5O__pline_debug