More normalization from develop

1 files changed, 24 insertions, 24 deletions

diff --git a/src/H5Glink.c b/src/H5Glink.c
index 61a8ae9..629cb11 100644
--- a/src/H5Glink.c
+++ b/src/H5Glink.c
@@ -58,10 +58,10 @@
 /* Local Prototypes */
 /********************/
 
-static int H5G_link_cmp_name_inc(const void *lnk1, const void *lnk2);
-static int H5G_link_cmp_name_dec(const void *lnk1, const void *lnk2);
-static int H5G_link_cmp_corder_inc(const void *lnk1, const void *lnk2);
-static int H5G_link_cmp_corder_dec(const void *lnk1, const void *lnk2);
+static int H5G__link_cmp_name_inc(const void *lnk1, const void *lnk2);
+static int H5G__link_cmp_name_dec(const void *lnk1, const void *lnk2);
+static int H5G__link_cmp_corder_inc(const void *lnk1, const void *lnk2);
+static int H5G__link_cmp_corder_dec(const void *lnk1, const void *lnk2);
 
 /*********************/
 /* Package Variables */
@@ -76,7 +76,7 @@ static int H5G_link_cmp_corder_dec(const void *lnk1, const void *lnk2);
 /*******************/
 
 /*-------------------------------------------------------------------------
- * Function:	H5G_link_cmp_name_inc
+ * Function:	H5G__link_cmp_name_inc
  *
  * Purpose:	Callback routine for comparing two link names, in
  *              increasing alphabetic order
@@ -93,15 +93,15 @@ static int H5G_link_cmp_corder_dec(const void *lnk1, const void *lnk2);
  *-------------------------------------------------------------------------
  */
 static int
-H5G_link_cmp_name_inc(const void *lnk1, const void *lnk2)
+H5G__link_cmp_name_inc(const void *lnk1, const void *lnk2)
 {
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
+    FUNC_ENTER_STATIC_NOERR
 
     FUNC_LEAVE_NOAPI(HDstrcmp(((const H5O_link_t *)lnk1)->name, ((const H5O_link_t *)lnk2)->name))
-} /* end H5G_link_cmp_name_inc() */
+} /* end H5G__link_cmp_name_inc() */
 
 /*-------------------------------------------------------------------------
- * Function:	H5G_link_cmp_name_dec
+ * Function:	H5G__link_cmp_name_dec
  *
  * Purpose:	Callback routine for comparing two link names, in
  *              decreasing alphabetic order
@@ -118,15 +118,15 @@ H5G_link_cmp_name_inc(const void *lnk1, const void *lnk2)
  *-------------------------------------------------------------------------
  */
 static int
-H5G_link_cmp_name_dec(const void *lnk1, const void *lnk2)
+H5G__link_cmp_name_dec(const void *lnk1, const void *lnk2)
 {
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
+    FUNC_ENTER_STATIC_NOERR
 
     FUNC_LEAVE_NOAPI(HDstrcmp(((const H5O_link_t *)lnk2)->name, ((const H5O_link_t *)lnk1)->name))
-} /* end H5G_link_cmp_name_dec() */
+} /* end H5G__link_cmp_name_dec() */
 
 /*-------------------------------------------------------------------------
- * Function:	H5G_link_cmp_corder_inc
+ * Function:	H5G__link_cmp_corder_inc
  *
  * Purpose:	Callback routine for comparing two link creation orders, in
  *              increasing order
@@ -142,11 +142,11 @@ H5G_link_cmp_name_dec(const void *lnk1, const void *lnk2)
  *-------------------------------------------------------------------------
  */
 static int
-H5G_link_cmp_corder_inc(const void *lnk1, const void *lnk2)
+H5G__link_cmp_corder_inc(const void *lnk1, const void *lnk2)
 {
     int ret_value = -1; /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
+    FUNC_ENTER_STATIC_NOERR
 
     if (((const H5O_link_t *)lnk1)->corder < ((const H5O_link_t *)lnk2)->corder)
         ret_value = -1;
@@ -156,10 +156,10 @@ H5G_link_cmp_corder_inc(const void *lnk1, const void *lnk2)
         ret_value = 0;
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_link_cmp_corder_inc() */
+} /* end H5G__link_cmp_corder_inc() */
 
 /*-------------------------------------------------------------------------
- * Function:	H5G_link_cmp_corder_dec
+ * Function:	H5G__link_cmp_corder_dec
  *
  * Purpose:	Callback routine for comparing two link creation orders, in
  *              decreasing order
@@ -175,11 +175,11 @@ H5G_link_cmp_corder_inc(const void *lnk1, const void *lnk2)
  *-------------------------------------------------------------------------
  */
 static int
-H5G_link_cmp_corder_dec(const void *lnk1, const void *lnk2)
+H5G__link_cmp_corder_dec(const void *lnk1, const void *lnk2)
 {
     int ret_value = -1; /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
+    FUNC_ENTER_STATIC_NOERR
 
     if (((const H5O_link_t *)lnk1)->corder < ((const H5O_link_t *)lnk2)->corder)
         ret_value = 1;
@@ -189,7 +189,7 @@ H5G_link_cmp_corder_dec(const void *lnk1, const void *lnk2)
         ret_value = 0;
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_link_cmp_corder_dec() */
+} /* end H5G__link_cmp_corder_dec() */
 
 /*-------------------------------------------------------------------------
  * Function:	H5G__ent_to_link
@@ -417,18 +417,18 @@ H5G__link_sort_table(H5G_link_table_t *ltable, H5_index_t idx_type, H5_iter_orde
     /* Pick appropriate sorting routine */
     if (idx_type == H5_INDEX_NAME) {
         if (order == H5_ITER_INC)
-            HDqsort(ltable->lnks, ltable->nlinks, sizeof(H5O_link_t), H5G_link_cmp_name_inc);
+            HDqsort(ltable->lnks, ltable->nlinks, sizeof(H5O_link_t), H5G__link_cmp_name_inc);
         else if (order == H5_ITER_DEC)
-            HDqsort(ltable->lnks, ltable->nlinks, sizeof(H5O_link_t), H5G_link_cmp_name_dec);
+            HDqsort(ltable->lnks, ltable->nlinks, sizeof(H5O_link_t), H5G__link_cmp_name_dec);
         else
             HDassert(order == H5_ITER_NATIVE);
     } /* end if */
     else {
         HDassert(idx_type == H5_INDEX_CRT_ORDER);
         if (order == H5_ITER_INC)
-            HDqsort(ltable->lnks, ltable->nlinks, sizeof(H5O_link_t), H5G_link_cmp_corder_inc);
+            HDqsort(ltable->lnks, ltable->nlinks, sizeof(H5O_link_t), H5G__link_cmp_corder_inc);
         else if (order == H5_ITER_DEC)
-            HDqsort(ltable->lnks, ltable->nlinks, sizeof(H5O_link_t), H5G_link_cmp_corder_dec);
+            HDqsort(ltable->lnks, ltable->nlinks, sizeof(H5O_link_t), H5G__link_cmp_corder_dec);
         else
             HDassert(order == H5_ITER_NATIVE);
     } /* end else */