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

diff --git a/src/H5FD.c b/src/H5FD.c
index bfe8026..7bc1663 100644
--- a/src/H5FD.c
+++ b/src/H5FD.c
@@ -113,7 +113,7 @@ H5FD_init_interface(void)
 {
     herr_t      ret_value=SUCCEED;       /* Return value */
 
-    FUNC_ENTER_NOINIT(H5FD_init_interface)
+    FUNC_ENTER_NOAPI_NOINIT(H5FD_init_interface)
 
     if (H5I_init_group(H5I_VFL, H5I_VFL_HASHSIZE, 0, (H5I_free_t)H5FD_free_cls)<0)
 	HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "unable to initialize interface")
@@ -151,7 +151,7 @@ H5FD_term_interface(void)
 {
     int	n = 0;
 
-    FUNC_ENTER_NOINIT(H5FD_term_interface)
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_term_interface)
 
     if (interface_initialize_g) {
 	if ((n=H5I_nmembers(H5I_VFL))) {
@@ -187,7 +187,7 @@ H5FD_term_interface(void)
 static herr_t
 H5FD_free_cls(H5FD_class_t *cls)
 {
-    FUNC_ENTER_NOINIT(H5FD_free_cls)
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_free_cls)
 
     H5MM_xfree(cls);
 
@@ -495,7 +495,7 @@ H5FD_pl_copy(void *(*copy_func)(const void *), size_t pl_size, const void *old_p
     void *new_pl = NULL;        /* Copy of property list */
     herr_t ret_value=SUCCEED;   /* Return value */
     
-    FUNC_ENTER_NOINIT(H5FD_pl_copy)
+    FUNC_ENTER_NOAPI_NOINIT(H5FD_pl_copy)
 
     /* Copy old pl, if one exists */
     if (old_pl) {
@@ -540,7 +540,7 @@ H5FD_pl_close(hid_t driver_id, herr_t (*free_func)(void *), void *pl)
 {
     herr_t      ret_value=SUCCEED;       /* Return value */
 
-    FUNC_ENTER_NOINIT(H5FD_pl_close)
+    FUNC_ENTER_NOAPI_NOINIT(H5FD_pl_close)
 
     /* Allow driver to free or do it ourselves */
     if (pl && free_func) {
@@ -2009,7 +2009,7 @@ H5FD_real_alloc(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size)
 {
     haddr_t ret_value = HADDR_UNDEF;
 
-    FUNC_ENTER_NOINIT(H5FD_real_alloc)
+    FUNC_ENTER_NOAPI_NOINIT(H5FD_real_alloc)
 
     /* check args */
     assert(file);
@@ -2055,7 +2055,7 @@ H5FD_update_eoa(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size)
     hsize_t wasted;
     haddr_t ret_value = HADDR_UNDEF;
 
-    FUNC_ENTER_NOINIT(H5FD_update_eoa)
+    FUNC_ENTER_NOAPI_NOINIT(H5FD_update_eoa)
 
     /* check args */
     assert(file);