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

diff --git a/src/H5R.c b/src/H5R.c
index 83be25b..a1d3281 100644
--- a/src/H5R.c
+++ b/src/H5R.c
@@ -60,7 +60,7 @@ H5R_init_interface(void)
 {
     herr_t      ret_value=SUCCEED;       /* Return value */
 
-    FUNC_ENTER_NOINIT(H5R_init_interface);
+    FUNC_ENTER_NOAPI_NOINIT(H5R_init_interface);
 
     /* Initialize the atom group for the file IDs */
     if (H5I_init_group(H5I_REFERENCE, H5I_REFID_HASHSIZE, H5R_RESERVED_ATOMS,
@@ -94,7 +94,7 @@ H5R_term_interface(void)
 {
     int	n=0;
 
-    FUNC_ENTER_NOINIT(H5R_term_interface);
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5R_term_interface);
     
     if (interface_initialize_g) {
 	if ((n=H5I_nmembers(H5I_REFERENCE))) {
@@ -143,7 +143,7 @@ H5R_create(void *_ref, H5G_entry_t *loc, const char *name, H5R_type_t ref_type,
     H5G_stat_t sb;              /* Stat buffer for retrieving OID */
     herr_t      ret_value=SUCCEED;       /* Return value */
 
-    FUNC_ENTER_NOINIT(H5R_create);
+    FUNC_ENTER_NOAPI_NOINIT(H5R_create);
 
     assert(_ref);
     assert(loc);
@@ -333,7 +333,7 @@ H5R_dereference(H5F_t *file, hid_t dxpl_id, H5R_type_t ref_type, void *_ref)
     int oid_type;               /* type of object being dereferenced */
     hid_t ret_value;
 
-    FUNC_ENTER_NOINIT(H5R_dereference);
+    FUNC_ENTER_NOAPI_NOINIT(H5R_dereference);
 
     assert(_ref);
     assert(ref_type>H5R_BADTYPE || ref_type<H5R_MAXTYPE);
@@ -515,7 +515,7 @@ H5R_get_region(H5F_t *file, hid_t dxpl_id, H5R_type_t UNUSED ref_type, void *_re
     uint8_t *buf;   /* Buffer to store serialized selection in */
     H5S_t *ret_value;
 
-    FUNC_ENTER_NOINIT(H5R_get_region);
+    FUNC_ENTER_NOAPI_NOINIT(H5R_get_region);
 
     assert(_ref);
     assert(ref_type==H5R_DATASET_REGION);
@@ -642,7 +642,7 @@ H5R_get_obj_type(H5F_t *file, hid_t dxpl_id, H5R_type_t ref_type, void *_ref)
     uint8_t *p;                 /* Pointer to OID to store */
     H5G_obj_t ret_value;        /* Return value */
 
-    FUNC_ENTER_NOINIT(H5R_get_obj_type);
+    FUNC_ENTER_NOAPI_NOINIT(H5R_get_obj_type);
 
     assert(file);
     assert(_ref);