[svn-r7917] Purpose:

    Code cleanup

Description:
    Clean up compiler warnings, especially the 'FUNC' variable not used which
comes out in production mode.

Solution:
    Had to add a new FUNC_ENTER_NOAPI_NOINIT_NOFUNC macro for those non-API
functions which don't need the 'FUNC' variable defined.  (This will be _so_
much easier when C99 is standard on all our supposed platforms, since it has a
__FUNC__ macro... )

Platforms tested:
    FreeBSD 4.9 (sleipnir)
    too minor for h5committest (although there were lots of files changed, the
        change was minor in each one)

1 files changed, 16 insertions, 16 deletions

diff --git a/src/H5FL.c b/src/H5FL.c
index b4c5613..0224b3e 100644
--- a/src/H5FL.c
+++ b/src/H5FL.c
@@ -173,7 +173,7 @@ H5FL_reg_init(H5FL_reg_head_t *head)
     H5FL_reg_gc_node_t *new_node;   /* Pointer to the node for the new list to garbage collect */
     herr_t ret_value=SUCCEED;   /* return value*/
 
-    FUNC_ENTER_NOINIT(H5FL_reg_init)
+    FUNC_ENTER_NOAPI_NOINIT(H5FL_reg_init)
 
     /* Allocate a new garbage collection node */
     if (NULL==(new_node = H5MM_malloc(sizeof(H5FL_reg_gc_node_t))))
@@ -383,7 +383,7 @@ H5FL_reg_gc_list(H5FL_reg_head_t *head)
     void *tmp;          /* Temporary node pointer */
     size_t total_mem;   /* Total memory used on list */
     
-    FUNC_ENTER_NOINIT(H5FL_reg_gc_list)
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_reg_gc_list)
 
     /* Calculate the total memory used on this list */
     total_mem=head->onlist*head->size;
@@ -441,7 +441,7 @@ H5FL_reg_gc(void)
     H5FL_reg_gc_node_t *gc_node;    /* Pointer into the list of things to garbage collect */
     herr_t ret_value=SUCCEED;   /* return value*/
     
-    FUNC_ENTER_NOINIT(H5FL_reg_gc)
+    FUNC_ENTER_NOAPI_NOINIT(H5FL_reg_gc)
 
     /* Walk through all the free lists, free()'ing the nodes */
     gc_node=H5FL_reg_gc_head.first;
@@ -493,7 +493,7 @@ H5FL_reg_term(void)
     H5FL_reg_gc_node_t *left;   /* pointer to garbage collection lists with work left */
     H5FL_reg_gc_node_t *tmp;    /* Temporary pointer to a garbage collection node */
 
-    FUNC_ENTER_NOINIT(H5FL_reg_term)
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_reg_term)
 
     if (interface_initialize_g) {
         /* Free the nodes on the garbage collection list, keeping nodes with allocations outstanding */
@@ -559,7 +559,7 @@ H5FL_blk_find_list(H5FL_blk_node_t **head, size_t size)
     H5FL_blk_node_t *temp;  /* Temp. pointer to node in the native list */
     H5FL_blk_node_t *ret_value;
 
-    FUNC_ENTER_NOINIT(H5FL_blk_find_list)
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_blk_find_list)
 
     /* Find the correct free list */
     temp=*head;
@@ -613,7 +613,7 @@ H5FL_blk_create_list(H5FL_blk_node_t **head, size_t size)
     H5FL_blk_node_t *temp;  /* Temp. pointer to node in the list */
     H5FL_blk_node_t *ret_value;
 
-    FUNC_ENTER_NOINIT(H5FL_blk_create_list)
+    FUNC_ENTER_NOAPI_NOINIT(H5FL_blk_create_list)
 
     /* Allocate room for the new free list node */
     if(NULL==(temp=H5FL_MALLOC(H5FL_blk_node_t)))
@@ -664,7 +664,7 @@ H5FL_blk_init(H5FL_blk_head_t *head)
     H5FL_blk_gc_node_t *new_node;   /* Pointer to the node for the new list to garbage collect */
     herr_t ret_value=SUCCEED;       /* return value*/
 
-    FUNC_ENTER_NOINIT(H5FL_blk_init)
+    FUNC_ENTER_NOAPI_NOINIT(H5FL_blk_init)
 
     /* Allocate a new garbage collection node */
     if (NULL==(new_node = H5MM_malloc(sizeof(H5FL_blk_gc_node_t))))
@@ -990,7 +990,7 @@ H5FL_blk_gc_list(H5FL_blk_head_t *head)
     void *next;     /* Temp. ptr to the free list list node */
     void *temp;     /* Temp. ptr to the free list page node */
     
-    FUNC_ENTER_NOINIT(H5FL_blk_gc_list)
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_blk_gc_list)
 
     /* Loop through all the nodes in the block free list queue */
     while(head->head!=NULL) {
@@ -1053,7 +1053,7 @@ H5FL_blk_gc(void)
     H5FL_blk_gc_node_t *gc_node;    /* Pointer into the list of things to garbage collect */
     herr_t ret_value=SUCCEED;   /* return value*/
     
-    FUNC_ENTER_NOINIT(H5FL_blk_gc)
+    FUNC_ENTER_NOAPI_NOINIT(H5FL_blk_gc)
 
     /* Walk through all the free lists, free()'ing the nodes */
     gc_node=H5FL_blk_gc_head.first;
@@ -1099,7 +1099,7 @@ H5FL_blk_term(void)
     H5FL_blk_gc_node_t *left;   /* pointer to garbage collection lists with work left */
     H5FL_blk_gc_node_t *tmp;    /* Temporary pointer to a garbage collection node */
 
-    FUNC_ENTER_NOINIT(H5FL_blk_term)
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_blk_term)
     
     /* Free the nodes on the garbage collection list, keeping nodes with allocations outstanding */
     left=NULL;
@@ -1157,7 +1157,7 @@ H5FL_arr_init(H5FL_arr_head_t *head)
     H5FL_gc_arr_node_t *new_node;   /* Pointer to the node for the new list to garbage collect */
     herr_t ret_value=SUCCEED;       /* return value*/
 
-    FUNC_ENTER_NOINIT(H5FL_arr_init)
+    FUNC_ENTER_NOAPI_NOINIT(H5FL_arr_init)
 
     /* Allocate a new garbage collection node */
     if (NULL==(new_node = H5MM_malloc(sizeof(H5FL_gc_arr_node_t))))
@@ -1489,7 +1489,7 @@ H5FL_arr_gc_list(H5FL_arr_head_t *head)
     size_t total_mem;   /* Total memory used on list */
     herr_t ret_value=SUCCEED;   /* return value*/
     
-    FUNC_ENTER_NOINIT(H5FL_arr_gc_list)
+    FUNC_ENTER_NOAPI_NOINIT(H5FL_arr_gc_list)
 
     /* Check if the array has a fixed maximum number of elements */
     if(head->maxelem>0) {
@@ -1559,7 +1559,7 @@ H5FL_arr_gc(void)
     H5FL_gc_arr_node_t *gc_arr_node;    /* Pointer into the list of things to garbage collect */
     herr_t ret_value=SUCCEED;   /* return value*/
     
-    FUNC_ENTER_NOINIT(H5FL_arr_gc)
+    FUNC_ENTER_NOAPI_NOINIT(H5FL_arr_gc)
 
     /* Walk through all the free lists, free()'ing the nodes */
     gc_arr_node=H5FL_arr_gc_head.first;
@@ -1605,7 +1605,7 @@ H5FL_arr_term(void)
     H5FL_gc_arr_node_t *left;   /* pointer to garbage collection lists with work left */
     H5FL_gc_arr_node_t *tmp;    /* Temporary pointer to a garbage collection node */
     
-    FUNC_ENTER_NOINIT(H5FL_arr_term)
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_arr_term)
 
     /* Free the nodes on the garbage collection list, keeping nodes with allocations outstanding */
     left=NULL;
@@ -1689,7 +1689,7 @@ H5FL_garbage_coll(void)
 {
     herr_t                  ret_value = SUCCEED;
 
-    FUNC_ENTER_NOINIT(H5FL_garbage_coll)
+    FUNC_ENTER_NOAPI_NOINIT(H5FL_garbage_coll)
 
     /* Garbage collect the free lists for array objects */
     if(H5FL_arr_gc()<0)
@@ -1788,7 +1788,7 @@ H5FL_term_interface(void)
 {
     int ret_value=0;
     
-    FUNC_ENTER_NOINIT(H5FL_term_interface)
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_term_interface)
 
     /* Garbage collect any nodes on the free lists */
     (void)H5FL_garbage_coll();