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

diff --git a/src/H5Omtime.c b/src/H5Omtime.c
index 0f56ee1..ac285bd 100644
--- a/src/H5Omtime.c
+++ b/src/H5Omtime.c
@@ -83,10 +83,6 @@ const H5O_class_t H5O_MTIME_NEW[1] = {{
     H5O_mtime_debug,		/*debug the message		*/
 }};
 
-/* Interface initialization */
-static int interface_initialize_g = 0;
-#define INTERFACE_INIT	NULL
-
 /* Current version of new mtime information */
 #define H5O_MTIME_VERSION 	1	
  
@@ -123,7 +119,7 @@ H5O_mtime_new_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const uint8_t *p,
     int		version;        /* Version of mtime information */
     void        *ret_value;     /* Return value */
 
-    FUNC_ENTER_NOAPI(H5O_mtime_new_decode, NULL);
+    FUNC_ENTER_NOAPI_NOINIT(H5O_mtime_new_decode);
 
     /* check args */
     assert(f);
@@ -181,7 +177,7 @@ H5O_mtime_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const uint8_t *p,
     struct tm	tm;
     void        *ret_value;     /* Return value */
 
-    FUNC_ENTER_NOAPI(H5O_mtime_decode, NULL);
+    FUNC_ENTER_NOAPI_NOINIT(H5O_mtime_decode);
 
     /* check args */
     assert(f);
@@ -301,9 +297,8 @@ static herr_t
 H5O_mtime_new_encode(H5F_t UNUSED *f, uint8_t *p, const void *_mesg)
 {
     const time_t	*mesg = (const time_t *) _mesg;
-    herr_t ret_value=SUCCEED;   /* Return value */
     
-    FUNC_ENTER_NOAPI(H5O_mtime_new_encode, FAIL);
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_mtime_new_encode);
 
     /* check args */
     assert(f);
@@ -321,8 +316,7 @@ H5O_mtime_new_encode(H5F_t UNUSED *f, uint8_t *p, const void *_mesg)
     /* Encode time */
     UINT32ENCODE(p, *mesg);
 
-done:
-    FUNC_LEAVE_NOAPI(ret_value);
+    FUNC_LEAVE_NOAPI(SUCCEED);
 } /* end H5O_mtime_new_encode() */
 
 
@@ -346,9 +340,8 @@ H5O_mtime_encode(H5F_t UNUSED *f, uint8_t *p, const void *_mesg)
 {
     const time_t	*mesg = (const time_t *) _mesg;
     struct tm		*tm;
-    herr_t ret_value=SUCCEED;   /* Return value */
     
-    FUNC_ENTER_NOAPI(H5O_mtime_encode, FAIL);
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_mtime_encode);
 
     /* check args */
     assert(f);
@@ -361,8 +354,7 @@ H5O_mtime_encode(H5F_t UNUSED *f, uint8_t *p, const void *_mesg)
 	    1900+tm->tm_year, 1+tm->tm_mon, tm->tm_mday,
 	    tm->tm_hour, tm->tm_min, tm->tm_sec);
 
-done:
-    FUNC_LEAVE_NOAPI(ret_value);
+    FUNC_LEAVE_NOAPI(SUCCEED);
 }
 
 
@@ -391,7 +383,7 @@ H5O_mtime_copy(const void *_mesg, void *_dest)
     time_t		*dest = (time_t *) _dest;
     void        *ret_value;     /* Return value */
 
-    FUNC_ENTER_NOAPI(H5O_mtime_copy, NULL);
+    FUNC_ENTER_NOAPI_NOINIT(H5O_mtime_copy);
 
     /* check args */
     assert(mesg);
@@ -432,16 +424,13 @@ done:
 static size_t
 H5O_mtime_new_size(H5F_t UNUSED * f, const void UNUSED * mesg)
 {
-    size_t ret_value=8;        /* Return value */
-
-    FUNC_ENTER_NOAPI(H5O_mtime_new_size, 0);
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_mtime_new_size);
 
     /* check args */
     assert(f);
     assert(mesg);
 
-done:
-    FUNC_LEAVE_NOAPI(ret_value);
+    FUNC_LEAVE_NOAPI(8);
 } /* end H5O_mtime_new_size() */
 
 
@@ -468,16 +457,13 @@ done:
 static size_t
 H5O_mtime_size(H5F_t UNUSED * f, const void UNUSED * mesg)
 {
-    size_t ret_value=16;        /* Return value */
-
-    FUNC_ENTER_NOAPI(H5O_mtime_size, 0);
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_mtime_size);
 
     /* check args */
     assert(f);
     assert(mesg);
 
-done:
-    FUNC_LEAVE_NOAPI(ret_value);
+    FUNC_LEAVE_NOAPI(16);
 }
 
 
@@ -499,12 +485,9 @@ done:
 static herr_t
 H5O_mtime_reset(void UNUSED *_mesg)
 {
-    herr_t      ret_value=SUCCEED;       /* Return value */
-
-    FUNC_ENTER_NOAPI(H5O_mtime_reset, FAIL);
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_mtime_reset);
 
-done:
-    FUNC_LEAVE_NOAPI(ret_value);
+    FUNC_LEAVE_NOAPI(SUCCEED);
 }
 
 
@@ -525,16 +508,13 @@ done:
 static herr_t
 H5O_mtime_free (void *mesg)
 {
-    herr_t ret_value=SUCCEED;   /* Return value */
-
-    FUNC_ENTER_NOAPI(H5O_mtime_free, FAIL);
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_mtime_free);
 
     assert (mesg);
 
     H5FL_FREE(time_t,mesg);
 
-done:
-    FUNC_LEAVE_NOAPI(ret_value);
+    FUNC_LEAVE_NOAPI(SUCCEED);
 }
 
 
@@ -560,9 +540,8 @@ H5O_mtime_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE *
     const time_t	*mesg = (const time_t *)_mesg;
     struct tm		*tm;
     char		buf[128];
-    herr_t ret_value=SUCCEED;   /* Return value */
     
-    FUNC_ENTER_NOAPI(H5O_mtime_debug, FAIL);
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_mtime_debug);
 
     /* check args */
     assert(f);
@@ -578,7 +557,6 @@ H5O_mtime_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE *
     fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
 	    "Time:", buf);
 
-done:
-    FUNC_LEAVE_NOAPI(ret_value);
+    FUNC_LEAVE_NOAPI(SUCCEED);
 }