More normalization from develop

1 files changed, 15 insertions, 15 deletions

diff --git a/src/H5Gstab.c b/src/H5Gstab.c
index d4a18b7..78981be 100644
--- a/src/H5Gstab.c
+++ b/src/H5Gstab.c
@@ -661,7 +661,7 @@ done:
 } /* end H5G__stab_bh_size() */
 
 /*-------------------------------------------------------------------------
- * Function:	H5G_stab_get_name_by_idx_cb
+ * Function:	H5G__stab_get_name_by_idx_cb
  *
  * Purpose:     Callback for B-tree iteration 'by index' info query to
  *              retrieve the name of a link
@@ -675,14 +675,14 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5G_stab_get_name_by_idx_cb(const H5G_entry_t *ent, void *_udata)
+H5G__stab_get_name_by_idx_cb(const H5G_entry_t *ent, void *_udata)
 {
     H5G_bt_it_gnbi_t *udata = (H5G_bt_it_gnbi_t *)_udata;
     size_t            name_off;            /* Offset of name in heap */
     const char *      name;                /* Pointer to name string in heap */
     herr_t            ret_value = SUCCEED; /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
     /* Sanity check */
     HDassert(ent);
@@ -699,7 +699,7 @@ H5G_stab_get_name_by_idx_cb(const H5G_entry_t *ent, void *_udata)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_stab_get_name_by_idx_cb */
+} /* end H5G__stab_get_name_by_idx_cb */
 
 /*-------------------------------------------------------------------------
  * Function:	H5G__stab_get_name_by_idx
@@ -754,7 +754,7 @@ H5G__stab_get_name_by_idx(const H5O_loc_t *oloc, H5_iter_order_t order, hsize_t
     /* Set iteration information */
     udata.common.idx      = n;
     udata.common.num_objs = 0;
-    udata.common.op       = H5G_stab_get_name_by_idx_cb;
+    udata.common.op       = H5G__stab_get_name_by_idx_cb;
     udata.heap            = heap;
     udata.name            = NULL;
     udata_valid           = TRUE;
@@ -790,7 +790,7 @@ done:
 } /* end H5G__stab_get_name_by_idx() */
 
 /*-------------------------------------------------------------------------
- * Function:	H5G_stab_lookup_cb
+ * Function:	H5G__stab_lookup_cb
  *
  * Purpose:     B-tree 'find' callback to retrieve location for an object
  *
@@ -804,12 +804,12 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5G_stab_lookup_cb(const H5G_entry_t *ent, void *_udata)
+H5G__stab_lookup_cb(const H5G_entry_t *ent, void *_udata)
 {
     H5G_stab_fnd_ud_t *udata     = (H5G_stab_fnd_ud_t *)_udata; /* 'User data' passed in */
     herr_t             ret_value = SUCCEED;                     /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
     /* Check for setting link info */
     if (udata->lnk)
@@ -819,7 +819,7 @@ H5G_stab_lookup_cb(const H5G_entry_t *ent, void *_udata)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_stab_lookup_cb() */
+} /* end H5G__stab_lookup_cb() */
 
 /*-------------------------------------------------------------------------
  * Function:	H5G__stab_lookup
@@ -865,7 +865,7 @@ H5G__stab_lookup(const H5O_loc_t *grp_oloc, const char *name, H5O_link_t *lnk)
     /* Set up the user data for actual B-tree find operation */
     bt_udata.common.name = name;
     bt_udata.common.heap = heap;
-    bt_udata.op          = H5G_stab_lookup_cb;
+    bt_udata.op          = H5G__stab_lookup_cb;
     bt_udata.op_data     = &udata;
 
     /* Search the B-tree */
@@ -881,7 +881,7 @@ done:
 } /* end H5G__stab_lookup() */
 
 /*-------------------------------------------------------------------------
- * Function:	H5G_stab_lookup_by_idx_cb
+ * Function:	H5G__stab_lookup_by_idx_cb
  *
  * Purpose:     Callback for B-tree iteration 'by index' info query to
  *              retrieve the link
@@ -895,13 +895,13 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5G_stab_lookup_by_idx_cb(const H5G_entry_t *ent, void *_udata)
+H5G__stab_lookup_by_idx_cb(const H5G_entry_t *ent, void *_udata)
 {
     H5G_bt_it_lbi_t *udata = (H5G_bt_it_lbi_t *)_udata;
     const char *     name;                /* Pointer to name string in heap */
     herr_t           ret_value = SUCCEED; /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
     /* Sanity check */
     HDassert(ent);
@@ -918,7 +918,7 @@ H5G_stab_lookup_by_idx_cb(const H5G_entry_t *ent, void *_udata)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_stab_lookup_by_idx_cb */
+} /* end H5G__stab_lookup_by_idx_cb */
 
 /*-------------------------------------------------------------------------
  * Function:	H5G__stab_lookup_by_idx
@@ -969,7 +969,7 @@ H5G__stab_lookup_by_idx(const H5O_loc_t *grp_oloc, H5_iter_order_t order, hsize_
     /* Set iteration information */
     udata.common.idx      = n;
     udata.common.num_objs = 0;
-    udata.common.op       = H5G_stab_lookup_by_idx_cb;
+    udata.common.op       = H5G__stab_lookup_by_idx_cb;
     udata.heap            = heap;
     udata.lnk             = lnk;
     udata.found           = FALSE;