[svn-r8731] Purpose:

    Code cleanup & minor optimization

Description:
    Re-work the way interface initialization routines are specified in the
library to avoid the overhead of checking for them in routines where there is
no interface initialization routine.  This cleans up warnings with gcc 3.4,
reduces the library binary size a bit (about 2-3%) and should speedup the
library's execution slightly.

Platforms tested:
    FreeBSD 4.10 (sleipnir) w/gcc34
    h5committest

1 files changed, 23 insertions, 51 deletions

diff --git a/src/H5Ofill.c b/src/H5Ofill.c
index ffe42a8..57039bf 100644
--- a/src/H5Ofill.c
+++ b/src/H5Ofill.c
@@ -90,10 +90,6 @@ const H5O_class_t H5O_FILL_NEW[1] = {{
 /* Revised version of the "new" fill value information */
 #define H5O_FILL_VERSION_2 	2	
  
-/* Interface initialization */
-static int interface_initialize_g = 0;
-#define INTERFACE_INIT NULL
-
 /* Declare a free list to manage the H5O_fill_new_t struct */
 H5FL_DEFINE(H5O_fill_new_t);
 
@@ -127,7 +123,7 @@ H5O_fill_new_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const uint8_t *p,
     int			version;
     void		*ret_value;
     
-    FUNC_ENTER_NOAPI(H5O_fill_new_decode, NULL);
+    FUNC_ENTER_NOAPI_NOINIT(H5O_fill_new_decode);
 
     assert(f);
     assert(p);
@@ -212,7 +208,7 @@ H5O_fill_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const uint8_t *p,
     H5O_fill_t  *mesg=NULL;
     void        *ret_value;
     
-    FUNC_ENTER_NOAPI(H5O_fill_decode, NULL);
+    FUNC_ENTER_NOAPI_NOINIT(H5O_fill_decode);
 
     assert(f);
     assert(p);
@@ -261,9 +257,8 @@ static herr_t
 H5O_fill_new_encode(H5F_t UNUSED *f, uint8_t *p, const void *_mesg)
 {
     const H5O_fill_new_t	*mesg = (const H5O_fill_new_t *)_mesg;
-    herr_t ret_value=SUCCEED;   /* Return value */
     
-    FUNC_ENTER_NOAPI(H5O_fill_new_encode, FAIL);
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_fill_new_encode);
 
     assert(f);
     assert(p);
@@ -288,8 +283,7 @@ H5O_fill_new_encode(H5F_t UNUSED *f, uint8_t *p, const void *_mesg)
             } /* end if */
     } /* end if */
 
-done:
-    FUNC_LEAVE_NOAPI(ret_value);
+    FUNC_LEAVE_NOAPI(SUCCEED);
 }
 
 
@@ -311,9 +305,8 @@ static herr_t
 H5O_fill_encode(H5F_t UNUSED *f, uint8_t *p, const void *_mesg)
 {
     const H5O_fill_t    *mesg = (const H5O_fill_t *)_mesg;
-    herr_t ret_value=SUCCEED;   /* Return value */
     
-    FUNC_ENTER_NOAPI(H5O_fill_encode, FAIL);
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_fill_encode);
 
     assert(f);
     assert(p);
@@ -323,8 +316,7 @@ H5O_fill_encode(H5F_t UNUSED *f, uint8_t *p, const void *_mesg)
     if(mesg->buf)
         HDmemcpy(p, mesg->buf, mesg->size);
 
-done:
-    FUNC_LEAVE_NOAPI(ret_value);
+    FUNC_LEAVE_NOAPI(SUCCEED);
 }
 
 
@@ -354,7 +346,7 @@ H5O_fill_new_copy(const void *_mesg, void *_dest)
     H5O_fill_new_t		*dest = (H5O_fill_new_t *)_dest;
     void		*ret_value;
 
-    FUNC_ENTER_NOAPI(H5O_fill_new_copy, NULL);
+    FUNC_ENTER_NOAPI_NOINIT(H5O_fill_new_copy);
 
     assert(mesg);
 
@@ -426,7 +418,7 @@ H5O_fill_copy(const void *_mesg, void *_dest)
     H5O_fill_t          *dest = (H5O_fill_t *)_dest;
     void                *ret_value;
 
-    FUNC_ENTER_NOAPI(H5O_fill_copy, NULL);
+    FUNC_ENTER_NOAPI_NOINIT(H5O_fill_copy);
 
     assert(mesg);
 
@@ -492,7 +484,7 @@ H5O_fill_new_size(H5F_t UNUSED *f, const void *_mesg)
     const H5O_fill_new_t	*mesg = (const H5O_fill_new_t *)_mesg;
     size_t			ret_value;
  
-    FUNC_ENTER_NOAPI(H5O_fill_new_size, 0);
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_fill_new_size);
 
     assert(f);
     assert(mesg);
@@ -505,7 +497,6 @@ H5O_fill_new_size(H5F_t UNUSED *f, const void *_mesg)
         ret_value += 4 +	/* Fill value size	 */
 		(mesg->size>0 ? mesg->size : 0);	/* Size of fill value	 */
 
-done:
     FUNC_LEAVE_NOAPI(ret_value);
 }
 
@@ -532,18 +523,13 @@ static size_t
 H5O_fill_size(H5F_t UNUSED *f, const void *_mesg)
 {
     const H5O_fill_t    *mesg = (const H5O_fill_t *)_mesg;
-    size_t ret_value;           /* Return value */
     
-    FUNC_ENTER_NOAPI(H5O_fill_size, 0);
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_fill_size);
 
     assert(f);
     assert(mesg);
 
-    /* Set return value */
-    ret_value=4+mesg->size;
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value);
+    FUNC_LEAVE_NOAPI(4+mesg->size);
 }
 
 
@@ -567,9 +553,8 @@ static herr_t
 H5O_fill_new_reset(void *_mesg)
 {
     H5O_fill_new_t	*mesg = (H5O_fill_new_t *)_mesg;
-    herr_t ret_value=SUCCEED;   /* Return value */
 
-    FUNC_ENTER_NOAPI(H5O_fill_new_reset, FAIL);
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_fill_new_reset);
 
     assert(mesg);
     
@@ -584,8 +569,7 @@ H5O_fill_new_reset(void *_mesg)
     mesg->fill_time    = (H5D_fill_time_t)0;
     mesg->fill_defined = FALSE; 
 
-done:
-    FUNC_LEAVE_NOAPI(ret_value);
+    FUNC_LEAVE_NOAPI(SUCCEED);
 }
 
 
@@ -607,9 +591,8 @@ static herr_t
 H5O_fill_reset(void *_mesg)
 {
     H5O_fill_t  *mesg = (H5O_fill_t *)_mesg;
-    herr_t ret_value=SUCCEED;   /* Return value */
 
-    FUNC_ENTER_NOAPI(H5O_fill_reset, FAIL);
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_fill_reset);
 
     assert(mesg);
     
@@ -621,8 +604,7 @@ H5O_fill_reset(void *_mesg)
         mesg->type = NULL;
     }
     
-done:
-    FUNC_LEAVE_NOAPI(ret_value);
+    FUNC_LEAVE_NOAPI(SUCCEED);
 }
 
 
@@ -643,16 +625,13 @@ done:
 static herr_t
 H5O_fill_new_free (void *mesg)
 {
-    herr_t ret_value=SUCCEED;   /* Return value */
-
-    FUNC_ENTER_NOAPI(H5O_fill_new_free, FAIL);
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_fill_new_free);
 
     assert (mesg);
 
     H5FL_FREE(H5O_fill_new_t,mesg);
 
-done:
-    FUNC_LEAVE_NOAPI(ret_value);
+    FUNC_LEAVE_NOAPI(SUCCEED);
 }
 
 
@@ -673,16 +652,13 @@ done:
 static herr_t
 H5O_fill_free (void *mesg)
 {
-    herr_t ret_value=SUCCEED;   /* Return value */
-
-    FUNC_ENTER_NOAPI(H5O_fill_free, FAIL);
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_fill_free);
 
     assert (mesg);
 
     H5FL_FREE(H5O_fill_t,mesg);
 
-done:
-    FUNC_LEAVE_NOAPI(ret_value);
+    FUNC_LEAVE_NOAPI(SUCCEED);
 }
 
 
@@ -706,9 +682,8 @@ H5O_fill_new_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FIL
 {
     const H5O_fill_new_t	*mesg = (const H5O_fill_new_t *)_mesg;
     H5D_fill_value_t fill_status;       /* Whether the fill value is defined */
-    herr_t ret_value=SUCCEED;   /* Return value */
     
-    FUNC_ENTER_NOAPI(H5O_fill_new_debug, FAIL);
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_fill_new_debug);
 
     assert(f);
     assert(mesg);
@@ -786,8 +761,7 @@ H5O_fill_new_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FIL
 	fprintf(stream, "<dataset type>\n");
     }
     
-done:
-    FUNC_LEAVE_NOAPI(ret_value);
+    FUNC_LEAVE_NOAPI(SUCCEED);
 }
 
 
@@ -810,9 +784,8 @@ H5O_fill_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE *s
 	       int indent, int fwidth)
 {
     const H5O_fill_t	*mesg = (const H5O_fill_t *)_mesg;
-    herr_t ret_value=SUCCEED;   /* Return value */
     
-    FUNC_ENTER_NOAPI(H5O_fill_debug, FAIL);
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_fill_debug);
 
     assert(f);
     assert(mesg);
@@ -830,8 +803,7 @@ H5O_fill_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE *s
 	fprintf(stream, "<dataset type>\n");
     }
     
-done:
-    FUNC_LEAVE_NOAPI(ret_value);
+    FUNC_LEAVE_NOAPI(SUCCEED);
 }