diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2012-02-09 03:13:27 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2012-02-09 03:13:27 (GMT) |
| commit | 9c9ee2008c10801c11bce8563894d9a30ba9a959 (patch) | |
| tree | c2b89df08fa3895d3fae1a4ad87353f9aabee598 /src/H5Edeprec.c | |
| parent | eb0e5f8c4ea29e674c97a8be048814e26379d4c1 (diff) | |
| download | hdf5-9c9ee2008c10801c11bce8563894d9a30ba9a959.zip hdf5-9c9ee2008c10801c11bce8563894d9a30ba9a959.tar.gz hdf5-9c9ee2008c10801c11bce8563894d9a30ba9a959.tar.bz2 | |
[svn-r21919] Description:
Refactor function name macros and simplify the FUNC_ENTER macros, to clear
away the cruft and prepare for further cleanups.
Tested on:
Mac OSX/64 10.7.3 (amazon) w/debug, production & parallel
Diffstat (limited to 'src/H5Edeprec.c')
| -rw-r--r-- | src/H5Edeprec.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/H5Edeprec.c b/src/H5Edeprec.c index 0a028d9..0d3083b 100644 --- a/src/H5Edeprec.c +++ b/src/H5Edeprec.c @@ -99,7 +99,7 @@ DESCRIPTION static herr_t H5E_init_deprec_interface(void) { - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_init_deprec_interface) + FUNC_ENTER_NOAPI_NOINIT_NOERR FUNC_LEAVE_NOAPI(H5E_init()) } /* H5E_init_deprec_interface() */ @@ -127,7 +127,7 @@ H5Eget_major(H5E_major_t maj) char *msg_str = NULL; char *ret_value; /* Return value */ - FUNC_ENTER_API_NOCLEAR(H5Eget_major, NULL) + FUNC_ENTER_API_NOCLEAR(NULL) /* Get the message object */ if(NULL == (msg = (H5E_msg_t *)H5I_object_verify(maj, H5I_ERROR_MSG))) @@ -179,7 +179,7 @@ H5Eget_minor(H5E_minor_t min) char *msg_str = NULL; char *ret_value; /* Return value */ - FUNC_ENTER_API_NOCLEAR(H5Eget_minor, NULL) + FUNC_ENTER_API_NOCLEAR(NULL) /* Get the message object */ if(NULL == (msg = (H5E_msg_t *)H5I_object_verify(min, H5I_ERROR_MSG))) @@ -236,7 +236,7 @@ H5Epush1(const char *file, const char *func, unsigned line, herr_t ret_value = SUCCEED; /* Return value */ /* Don't clear the error stack! :-) */ - FUNC_ENTER_API_NOCLEAR(H5Epush1, FAIL) + FUNC_ENTER_API_NOCLEAR(FAIL) H5TRACE6("e", "*s*sIuii*s", file, func, line, maj, min, str); /* Push the error on the default error stack */ @@ -267,7 +267,7 @@ H5Eclear1(void) herr_t ret_value = SUCCEED; /* Return value */ /* Don't clear the error stack! :-) */ - FUNC_ENTER_API_NOCLEAR(H5Eclear1, FAIL) + FUNC_ENTER_API_NOCLEAR(FAIL) H5TRACE0("e",""); /* Clear the default error stack */ @@ -302,7 +302,7 @@ H5Eprint1(FILE *stream) herr_t ret_value = SUCCEED; /* Return value */ /* Don't clear the error stack! :-) */ - FUNC_ENTER_API_NOCLEAR(H5Eprint1, FAIL) + FUNC_ENTER_API_NOCLEAR(FAIL) /*NO TRACE*/ if(NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in non-threaded case */ @@ -339,7 +339,7 @@ H5Ewalk1(H5E_direction_t direction, H5E_walk1_t func, void *client_data) herr_t ret_value = SUCCEED; /* Return value */ /* Don't clear the error stack! :-) */ - FUNC_ENTER_API_NOCLEAR(H5Ewalk1, FAIL) + FUNC_ENTER_API_NOCLEAR(FAIL) /*NO TRACE*/ if(NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in non-threaded case */ @@ -384,7 +384,7 @@ H5Eget_auto1(H5E_auto1_t *func, void **client_data) H5E_auto_op_t auto_op; /* Error stack operator */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Eget_auto1, FAIL) + FUNC_ENTER_API(FAIL) H5TRACE2("e", "*x**x", func, client_data); /* Retrieve default error stack */ @@ -441,7 +441,7 @@ H5Eset_auto1(H5E_auto1_t func, void *client_data) herr_t ret_value = SUCCEED; /* Return value */ /* Don't clear the error stack! :-) */ - FUNC_ENTER_API_NOCLEAR(H5Eset_auto1, FAIL) + FUNC_ENTER_API_NOCLEAR(FAIL) H5TRACE2("e", "x*x", func, client_data); if(NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in non-threaded case */ |