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

diff --git a/src/H5O.c b/src/H5O.c
index 48c0751..c9fc875 100644
--- a/src/H5O.c
+++ b/src/H5O.c
@@ -170,7 +170,7 @@ H5FL_EXTERN(time_t);
 static herr_t
 H5O_init_interface(void)
 {
-    FUNC_ENTER_NOINIT(H5O_init_interface);
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_init_interface);
 
     /*
      * Initialize functions that decode messages from symbol table entries.
@@ -265,7 +265,7 @@ H5O_init(H5F_t *f, hid_t dxpl_id, size_t size_hint, H5G_entry_t *ent/*out*/, had
     haddr_t     tmp_addr;
     herr_t      ret_value = SUCCEED;    /* return value */
 
-    FUNC_ENTER_NOINIT(H5O_init);
+    FUNC_ENTER_NOAPI_NOINIT(H5O_init);
 
     /* check args */
     assert(f);
@@ -810,7 +810,7 @@ H5O_dest(H5F_t UNUSED *f, H5O_t *oh)
 {
     unsigned	i;
 
-    FUNC_ENTER_NOINIT(H5O_dest);
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_dest);
 
     /* check args */
     assert(oh);
@@ -867,7 +867,7 @@ H5O_clear(H5F_t *f, H5O_t *oh, hbool_t destroy)
     unsigned	u;      /* Local index variable */
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOINIT(H5O_clear);
+    FUNC_ENTER_NOAPI_NOINIT(H5O_clear);
 
     /* check args */
     assert(oh);
@@ -957,7 +957,7 @@ H5O_reset_real(const H5O_class_t *type, void *native)
 {
     herr_t      ret_value=SUCCEED;       /* Return value */
 
-    FUNC_ENTER_NOINIT(H5O_reset_real);
+    FUNC_ENTER_NOAPI_NOINIT(H5O_reset_real);
 
     /* check args */
     assert(type);
@@ -1036,7 +1036,7 @@ H5O_free_real(const H5O_class_t *type, void *mesg)
 {
     void * ret_value=NULL;      /* Return value */
 
-    FUNC_ENTER_NOINIT(H5O_free_real);
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_free_real);
     
     /* check args */
     assert(type);
@@ -1118,7 +1118,7 @@ H5O_copy_real (const H5O_class_t *type, const void *mesg, void *dst)
 {
     void	*ret_value = NULL;
     
-    FUNC_ENTER_NOINIT(H5O_copy_real);
+    FUNC_ENTER_NOAPI_NOINIT(H5O_copy_real);
 
     /* check args */
     assert (type);
@@ -1393,7 +1393,7 @@ H5O_exists_real(H5G_entry_t *ent, const H5O_class_t *type, int sequence, hid_t d
     unsigned	u;
     htri_t      ret_value;       /* Return value */
     
-    FUNC_ENTER_NOINIT(H5O_exists_real);
+    FUNC_ENTER_NOAPI_NOINIT(H5O_exists_real);
 
     assert(ent);
     assert(ent->file);
@@ -1517,7 +1517,7 @@ H5O_read_real(H5G_entry_t *ent, const H5O_class_t *type, int sequence, void *mes
     H5G_type_t      cache_type;
     void           *ret_value = NULL;
 
-    FUNC_ENTER_NOINIT(H5O_read_real);
+    FUNC_ENTER_NOAPI_NOINIT(H5O_read_real);
 
     /* check args */
     assert(ent);
@@ -1602,7 +1602,7 @@ H5O_find_in_ohdr(H5F_t *f, hid_t dxpl_id, H5O_t *oh, const H5O_class_t **type_p,
     const H5O_class_t	*type = NULL;
     unsigned		ret_value;
 
-    FUNC_ENTER_NOINIT(H5O_find_in_ohdr);
+    FUNC_ENTER_NOAPI_NOINIT(H5O_find_in_ohdr);
 
     /* Check args */
     assert(f);
@@ -2006,7 +2006,7 @@ H5O_append_real(H5F_t *f, hid_t dxpl_id, H5O_t *oh, const H5O_class_t *type,
     H5O_shared_t	sh_mesg;
     int		        ret_value = FAIL;
 
-    FUNC_ENTER_NOINIT(H5O_append_real);
+    FUNC_ENTER_NOAPI_NOINIT(H5O_append_real);
 
     /* check args */
     assert(f);
@@ -2054,7 +2054,7 @@ H5O_new_mesg(H5F_t *f, H5O_t *oh, unsigned *flags, const H5O_class_t *orig_type,
     size_t	size;                   /* Size of space allocated for object header */
     unsigned    ret_value=UFAIL;        /* Return value */
 
-    FUNC_ENTER_NOINIT(H5O_new_mesg);
+    FUNC_ENTER_NOAPI_NOINIT(H5O_new_mesg);
 
     /* check args */
     assert(f);
@@ -2128,7 +2128,7 @@ H5O_write_mesg(H5O_t *oh, unsigned idx, const H5O_class_t *type,
     H5O_mesg_t         *idx_msg;        /* Pointer to message to modify */
     herr_t      ret_value=SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOINIT(H5O_write_mesg);
+    FUNC_ENTER_NOAPI_NOINIT(H5O_write_mesg);
 
     /* check args */
     assert(oh);
@@ -2181,7 +2181,7 @@ H5O_touch_oh(H5F_t *f, H5O_t *oh, hbool_t force)
     size_t	size;
     herr_t      ret_value=SUCCEED;       /* Return value */
     
-    FUNC_ENTER_NOINIT(H5O_touch_oh);
+    FUNC_ENTER_NOAPI_NOINIT(H5O_touch_oh);
 
     assert(oh);
 
@@ -2463,7 +2463,7 @@ H5O_remove_real(H5G_entry_t *ent, const H5O_class_t *type, int sequence, hid_t d
     unsigned	u;
     herr_t      ret_value=SUCCEED;       /* Return value */
 
-    FUNC_ENTER_NOINIT(H5O_remove_real);
+    FUNC_ENTER_NOAPI_NOINIT(H5O_remove_real);
 
     /* check args */
     assert(ent);
@@ -2559,7 +2559,7 @@ H5O_alloc_extend_chunk(H5O_t *oh, unsigned chunkno, size_t size)
     uint8_t	*old_addr;
     unsigned	ret_value;
 
-    FUNC_ENTER_NOINIT(H5O_alloc_extend_chunk);
+    FUNC_ENTER_NOAPI_NOINIT(H5O_alloc_extend_chunk);
 
     /* check args */
     assert(oh);
@@ -2694,7 +2694,7 @@ H5O_alloc_new_chunk(H5F_t *f, H5O_t *oh, size_t size)
     unsigned	u;
     unsigned	ret_value;		/*return value	*/
 
-    FUNC_ENTER_NOINIT(H5O_alloc_new_chunk);
+    FUNC_ENTER_NOAPI_NOINIT(H5O_alloc_new_chunk);
 
     /* check args */
     assert (oh);
@@ -2877,7 +2877,7 @@ H5O_alloc(H5F_t *f, H5O_t *oh, const H5O_class_t *type, size_t size)
     size_t	aligned_size = H5O_ALIGN(size);
     unsigned	ret_value;      /* Return value */
 
-    FUNC_ENTER_NOINIT(H5O_alloc);
+    FUNC_ENTER_NOAPI_NOINIT(H5O_alloc);
 
     /* check args */
     assert (oh);
@@ -3002,7 +3002,7 @@ H5O_share (H5F_t *f, hid_t dxpl_id, const H5O_class_t *type, const void *mesg,
     void	*buf = NULL;
     herr_t      ret_value=SUCCEED;       /* Return value */
     
-    FUNC_ENTER_NOINIT(H5O_share);
+    FUNC_ENTER_NOAPI_NOINIT(H5O_share);
 
     /* Check args */
     assert (f);
@@ -3188,7 +3188,7 @@ H5O_delete_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh)
     unsigned	u;
     herr_t ret_value=SUCCEED;   /* Return value */
     
-    FUNC_ENTER_NOINIT(H5O_delete_oh);
+    FUNC_ENTER_NOAPI_NOINIT(H5O_delete_oh);
 
     /* Check args */
     assert (f);
@@ -3250,7 +3250,7 @@ H5O_delete_mesg(H5F_t *f, hid_t dxpl_id, H5O_mesg_t *mesg)
     const H5O_class_t	*type;  /* Type of object to free */
     herr_t ret_value=SUCCEED;   /* Return value */
     
-    FUNC_ENTER_NOINIT(H5O_delete_mesg);
+    FUNC_ENTER_NOAPI_NOINIT(H5O_delete_mesg);
 
     /* Check args */
     assert (f);