[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, 32 insertions, 32 deletions

diff --git a/src/H5FPserver.c b/src/H5FPserver.c
index 47fefe6..13b22f9 100644
--- a/src/H5FPserver.c
+++ b/src/H5FPserver.c
@@ -290,7 +290,7 @@ H5FP_sap_receive(H5FP_request_t *req, int source, int tag, char **buf)
     herr_t ret_value = SUCCEED;
     int mrc;
 
-    FUNC_ENTER_NOINIT(H5FP_sap_receive);
+    FUNC_ENTER_NOAPI_NOINIT(H5FP_sap_receive);
 
     HDmemset(&status, 0, sizeof(status));
 
@@ -318,7 +318,7 @@ H5FP_object_lock_cmp(H5FP_object_lock *o1,
                      H5FP_object_lock *o2,
                      int UNUSED cmparg)
 {
-    FUNC_ENTER_NOINIT(H5FP_object_lock_cmp);
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FP_object_lock_cmp);
     assert(o1);
     assert(o2);
     FUNC_LEAVE_NOAPI(o2->oid - o1->oid);
@@ -345,7 +345,7 @@ H5FP_new_object_lock(hobj_ref_t oid, unsigned rank, H5FP_obj_t obj_type,
     int                 comm_size;
     H5FP_object_lock   *ret_value = NULL;
     
-    FUNC_ENTER_NOINIT(H5FP_new_object_lock);
+    FUNC_ENTER_NOAPI_NOINIT(H5FP_new_object_lock);
 
     if (MPI_Comm_size(H5FP_SAP_COMM, &comm_size) != MPI_SUCCESS)
         HGOTO_ERROR(H5E_INTERNAL, H5E_MPI, NULL, "MPI_Comm_size failed");
@@ -353,7 +353,7 @@ H5FP_new_object_lock(hobj_ref_t oid, unsigned rank, H5FP_obj_t obj_type,
     if ((ret_value = (H5FP_object_lock *)H5MM_malloc(sizeof(H5FP_object_lock))) == NULL)
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "out of memory");
 
-    if ((ret_value->num_locks = (unsigned char *)HDcalloc(comm_size, 1)) == NULL) {
+    if ((ret_value->num_locks = (unsigned char *)HDcalloc((size_t)comm_size, 1)) == NULL) {
         HDfree(ret_value);
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "out of memory");
     }
@@ -378,7 +378,7 @@ done:
 static herr_t
 H5FP_free_object_lock(H5FP_object_lock *ol)
 {
-    FUNC_ENTER_NOINIT(H5FP_free_object_lock);
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FP_free_object_lock);
 
     if (ol) {
         HDfree(ol->num_locks);
@@ -401,7 +401,7 @@ H5FP_find_object_lock(H5FP_file_info *info, hobj_ref_t oid)
 {
     H5FP_object_lock *ret_value = NULL;
 
-    FUNC_ENTER_NOINIT(H5FP_find_object_lock);
+    FUNC_ENTER_NOAPI_NOINIT(H5FP_find_object_lock);
 
     assert(info);
     assert(oid);
@@ -438,7 +438,7 @@ H5FP_remove_object_lock_from_list(H5FP_file_info *info,
     H5TB_NODE *node;
     herr_t ret_value = FAIL;
 
-    FUNC_ENTER_NOINIT(H5FP_remove_object_lock_from_list);
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FP_remove_object_lock_from_list);
 
     if ((node = H5TB_dfind(info->locks, (void *)ol, NULL)) != NULL) {
         H5FP_free_object_lock(H5TB_rem(&info->locks->root, node, NULL));
@@ -460,7 +460,7 @@ H5FP_file_mod_cmp(H5FP_mdata_mod *k1,
                   H5FP_mdata_mod *k2,
                   int UNUSED cmparg)
 {
-    FUNC_ENTER_NOINIT(H5FP_file_mod_cmp);
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FP_file_mod_cmp);
     assert(k1);
     assert(k2);
     FUNC_LEAVE_NOAPI(k2->addr - k1->addr);
@@ -477,7 +477,7 @@ H5FP_file_mod_cmp(H5FP_mdata_mod *k1,
 static herr_t
 H5FP_free_mod_node(H5FP_mdata_mod *info)
 {
-    FUNC_ENTER_NOINIT(H5FP_free_mod_node);
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FP_free_mod_node);
 
     if (info) {
         HDfree(info->metadata);
@@ -502,7 +502,7 @@ H5FP_new_file_mod_node(H5FD_mem_t mem_type, haddr_t addr, unsigned md_size, char
 {
     H5FP_mdata_mod *ret_value = NULL;
 
-    FUNC_ENTER_NOINIT(H5FP_new_file_mod_node);
+    FUNC_ENTER_NOAPI_NOINIT(H5FP_new_file_mod_node);
 
     if ((ret_value = (H5FP_mdata_mod *)H5MM_malloc(sizeof(H5FP_mdata_mod))) == NULL)
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "out of memory");
@@ -536,7 +536,7 @@ H5FP_add_file_mod_to_list(H5FP_file_info *info, H5FD_mem_t mem_type,
     H5TB_NODE *node;
     herr_t ret_value = FAIL;
 
-    FUNC_ENTER_NOINIT(H5FP_add_file_mod_to_list);
+    FUNC_ENTER_NOAPI_NOINIT(H5FP_add_file_mod_to_list);
 
     /* check args */
     assert(info);
@@ -580,7 +580,7 @@ done:
 static herr_t
 H5FP_free_file_info_node(H5FP_file_info *info)
 {
-    FUNC_ENTER_NOINIT(H5FP_free_file_info_node);
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FP_free_file_info_node);
 
     if (info) {
         H5TB_dfree(info->mod_tree, (void (*)(void*))H5FP_free_mod_node, NULL);
@@ -602,7 +602,7 @@ H5FP_free_file_info_node(H5FP_file_info *info)
 static int
 H5FP_file_info_cmp(H5FP_file_info *k1, H5FP_file_info *k2, int UNUSED cmparg)
 {
-    FUNC_ENTER_NOINIT(H5FP_file_info_cmp);
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FP_file_info_cmp);
     assert(k1);
     assert(k2);
     FUNC_LEAVE_NOAPI(k1->file_id - k2->file_id);
@@ -621,7 +621,7 @@ H5FP_new_file_info_node(unsigned file_id)
 {
     H5FP_file_info *ret_value;
 
-    FUNC_ENTER_NOINIT(H5FP_new_file_info_node);
+    FUNC_ENTER_NOAPI_NOINIT(H5FP_new_file_info_node);
 
     if ((ret_value = (H5FP_file_info *)H5MM_malloc(sizeof(H5FP_file_info))) == NULL)
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "out of memory");
@@ -661,7 +661,7 @@ H5FP_find_file_info(unsigned file_id)
     H5TB_NODE *node = NULL;
     H5FP_file_info *ret_value = NULL;
 
-    FUNC_ENTER_NOINIT(H5FP_find_file_info);
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FP_find_file_info);
 
     if (file_info_tree && file_info_tree->root) {
         H5FP_file_info s;
@@ -694,7 +694,7 @@ H5FP_add_new_file_info_to_list(unsigned file_id, haddr_t maxaddr,
     H5FP_file_info *info;
     herr_t ret_value = FAIL;
 
-    FUNC_ENTER_NOINIT(H5FP_add_new_file_info_to_list);
+    FUNC_ENTER_NOAPI_NOINIT(H5FP_add_new_file_info_to_list);
 
     if ((info = H5FP_new_file_info_node(file_id)) != NULL) {
         int mrc;
@@ -753,7 +753,7 @@ H5FP_remove_file_id_from_list(unsigned file_id)
     H5TB_NODE *node;
     herr_t ret_value = FAIL;
 
-    FUNC_ENTER_NOINIT(H5FP_remove_file_id_from_list);
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FP_remove_file_id_from_list);
 
     s.file_id = file_id;    /* This is the key field for the TBBT */
 
@@ -786,7 +786,7 @@ H5FP_send_reply(unsigned to, unsigned req_id, unsigned file_id, H5FP_status_t st
     herr_t ret_value = SUCCEED;
     int mrc;
 
-    FUNC_ENTER_NOINIT(H5FP_send_reply);
+    FUNC_ENTER_NOAPI_NOINIT(H5FP_send_reply);
 
     reply.req_id = req_id;
     reply.file_id = file_id;
@@ -817,7 +817,7 @@ H5FP_dump(H5FP_file_info *info, unsigned to, unsigned req_id, unsigned file_id)
     herr_t ret_value = SUCCEED;
     int mrc;
 
-    FUNC_ENTER_NOINIT(H5FP_dump);
+    FUNC_ENTER_NOAPI_NOINIT(H5FP_dump);
 
     /* check args */
     assert(info);
@@ -891,7 +891,7 @@ static unsigned
 H5FP_gen_sap_file_id()
 {
     static unsigned i = 0;
-    FUNC_ENTER_NOINIT(H5FP_gen_sap_file_id);
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FP_gen_sap_file_id);
     FUNC_LEAVE_NOAPI(i++);
 }
 
@@ -909,7 +909,7 @@ H5FP_sap_handle_open_request(H5FP_request_t *req, unsigned UNUSED md_size)
     herr_t ret_value = SUCCEED;
     int mrc;
 
-    FUNC_ENTER_NOINIT(H5FP_sap_handle_open_request);
+    FUNC_ENTER_NOAPI_NOINIT(H5FP_sap_handle_open_request);
 
     if (req->obj_type == H5FP_OBJ_FILE) {
         unsigned new_file_id = H5FP_gen_sap_file_id();
@@ -962,7 +962,7 @@ H5FP_sap_handle_lock_request(H5FP_request_t *req)
     unsigned        i, j;
     herr_t          ret_value = SUCCEED;
 
-    FUNC_ENTER_NOINIT(H5FP_sap_handle_lock_request);
+    FUNC_ENTER_NOAPI_NOINIT(H5FP_sap_handle_lock_request);
 
     if ((oids = (struct lock_group *)H5MM_malloc(list_size *
                                                  sizeof(struct lock_group))) == NULL) {
@@ -1168,7 +1168,7 @@ H5FP_sap_handle_release_lock_request(H5FP_request_t *req)
     herr_t ret_value = SUCCEED;
     unsigned i, j;
 
-    FUNC_ENTER_NOINIT(H5FP_sap_handle_release_lock_request);
+    FUNC_ENTER_NOAPI_NOINIT(H5FP_sap_handle_release_lock_request);
 
     if ((oids = (struct release_group *)H5MM_malloc(list_size *
                                                  sizeof(struct release_group))) == NULL) {
@@ -1273,7 +1273,7 @@ H5FP_sap_handle_read_request(H5FP_request_t *req)
     char *metadata = NULL;
     int mrc;
 
-    FUNC_ENTER_NOINIT(H5FP_sap_handle_read_request);
+    FUNC_ENTER_NOAPI_NOINIT(H5FP_sap_handle_read_request);
 
     r.req_id = req->req_id;
     r.file_id = req->file_id;
@@ -1355,7 +1355,7 @@ H5FP_sap_handle_write_request(H5FP_request_t *req, char *mdata, unsigned md_size
     H5FP_status_t exit_state = H5FP_STATUS_OK;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOINIT(H5FP_sap_handle_write_request);
+    FUNC_ENTER_NOAPI_NOINIT(H5FP_sap_handle_write_request);
 
     if ((info = H5FP_find_file_info(req->file_id)) != NULL) {
         if (info->num_mods >= H5FP_MDATA_CACHE_HIGHWATER_MARK) {
@@ -1415,7 +1415,7 @@ H5FP_sap_handle_flush_request(H5FP_request_t *req)
     H5FP_status_t exit_state = H5FP_STATUS_OK;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOINIT(H5FP_sap_handle_flush_request);
+    FUNC_ENTER_NOAPI_NOINIT(H5FP_sap_handle_flush_request);
 
     if ((info = H5FP_find_file_info(req->file_id)) != NULL) {
         if (info->num_mods) {
@@ -1461,7 +1461,7 @@ H5FP_sap_handle_close_request(H5FP_request_t *req)
     H5FP_status_t exit_state = H5FP_STATUS_OK;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOINIT(H5FP_sap_handle_close_request);
+    FUNC_ENTER_NOAPI_NOINIT(H5FP_sap_handle_close_request);
 
     if ((info = H5FP_find_file_info(req->file_id)) != NULL) {
         int comm_size;
@@ -1507,7 +1507,7 @@ H5FP_sap_handle_alloc_request(H5FP_request_t *req)
     int             mrc;
     herr_t          ret_value = SUCCEED;
 
-    FUNC_ENTER_NOINIT(H5FP_sap_handle_alloc_request);
+    FUNC_ENTER_NOAPI_NOINIT(H5FP_sap_handle_alloc_request);
 
     sap_alloc.req_id = req->req_id;
     sap_alloc.file_id = req->file_id;
@@ -1570,7 +1570,7 @@ H5FP_sap_handle_free_request(H5FP_request_t *req)
     herr_t          ret_value = SUCCEED;
     int             mrc;
 
-    FUNC_ENTER_NOINIT(H5FP_sap_handle_free_request);
+    FUNC_ENTER_NOAPI_NOINIT(H5FP_sap_handle_free_request);
 
     sap_alloc.req_id = req->req_id;
     sap_alloc.file_id = req->file_id;
@@ -1617,7 +1617,7 @@ H5FP_sap_handle_get_eoa_request(H5FP_request_t *req)
     int             mrc;
     herr_t          ret_value = SUCCEED;
 
-    FUNC_ENTER_NOINIT(H5FP_sap_handle_get_eoa_request);
+    FUNC_ENTER_NOAPI_NOINIT(H5FP_sap_handle_get_eoa_request);
 
     sap_eoa.req_id = req->req_id;
     sap_eoa.file_id = req->file_id;
@@ -1656,7 +1656,7 @@ H5FP_sap_handle_set_eoa_request(H5FP_request_t *req)
     int             mrc;
     herr_t          ret_value = SUCCEED;
 
-    FUNC_ENTER_NOINIT(H5FP_sap_handle_set_eoa_request);
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FP_sap_handle_set_eoa_request);
 
     if ((info = H5FP_find_file_info(req->file_id)) != NULL) {
         /* Get the EOA. */
@@ -1689,7 +1689,7 @@ H5FP_sap_handle_update_eoma_eosda_request(H5FP_request_t *req)
     herr_t          ret_value = SUCCEED;
     int             mrc;
 
-    FUNC_ENTER_NOINIT(H5FP_sap_handle_update_eoma_eosda_request);
+    FUNC_ENTER_NOAPI_NOINIT(H5FP_sap_handle_update_eoma_eosda_request);
 
     sap_eoa.req_id = req->req_id;
     sap_eoa.file_id = req->file_id;