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/H5Fefc.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/H5Fefc.c')
| -rw-r--r-- | src/H5Fefc.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/H5Fefc.c b/src/H5Fefc.c index 1dc7f70..08d27a1 100644 --- a/src/H5Fefc.c +++ b/src/H5Fefc.c @@ -95,7 +95,7 @@ H5F_efc_create(unsigned max_nfiles) H5F_efc_t *efc = NULL; /* EFC object */ H5F_efc_t *ret_value; /* Return value */ - FUNC_ENTER_NOAPI(H5F_efc_create, NULL) + FUNC_ENTER_NOAPI(NULL) /* Sanity checks */ HDassert(max_nfiles > 0); @@ -149,7 +149,7 @@ H5F_efc_open(H5F_t *parent, const char *name, unsigned flags, hid_t fcpl_id, hbool_t open_file = FALSE; /* Whether ent->file needs to be closed in case of error */ H5F_t *ret_value = NULL; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5F_efc_open) + FUNC_ENTER_NOAPI_NOINIT /* Sanity checks */ HDassert(parent); @@ -338,7 +338,7 @@ H5F_efc_close(H5F_t *parent, H5F_t *file) H5F_efc_ent_t *ent = NULL; /* Entry for target file in efc */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5F_efc_close) + FUNC_ENTER_NOAPI_NOINIT /* Sanity checks */ HDassert(parent); @@ -396,7 +396,7 @@ done: unsigned H5F_efc_max_nfiles(H5F_efc_t *efc) { - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_efc_max_nfiles) + FUNC_ENTER_NOAPI_NOINIT_NOERR HDassert(efc); HDassert(efc->max_nfiles > 0); @@ -427,7 +427,7 @@ H5F_efc_release(H5F_efc_t *efc) H5F_efc_ent_t *prev_ent = NULL; /* Previous EFC entry */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5F_efc_release) + FUNC_ENTER_NOAPI_NOINIT /* Sanity checks */ HDassert(efc); @@ -487,7 +487,7 @@ H5F_efc_destroy(H5F_efc_t *efc) { herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5F_efc_destroy) + FUNC_ENTER_NOAPI_NOINIT /* Sanity checks */ HDassert(efc); @@ -538,7 +538,7 @@ H5F_efc_remove_ent(H5F_efc_t *efc, H5F_efc_ent_t *ent) { herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5F_efc_remove_ent) + FUNC_ENTER_NOAPI_NOINIT /* Sanity checks */ HDassert(efc); @@ -605,7 +605,7 @@ H5F_efc_try_close_tag1(H5F_file_t *sf, H5F_file_t **tail) H5F_efc_ent_t *ent = NULL; /* EFC entry */ H5F_file_t *esf; /* Convenience pointer to ent->file->shared */ - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_efc_try_close_tag1) + FUNC_ENTER_NOAPI_NOINIT_NOERR /* Sanity checks */ HDassert(sf); @@ -679,7 +679,7 @@ H5F_efc_try_close_tag2(H5F_file_t *sf, H5F_file_t **tail) H5F_efc_ent_t *ent = NULL; /* EFC entry */ H5F_file_t *esf; /* Convenience pointer to ent->file->shared */ - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_efc_try_close_tag2) + FUNC_ENTER_NOAPI_NOINIT_NOERR /* Sanity checks */ HDassert(sf); @@ -790,7 +790,7 @@ H5F_efc_try_close(H5F_t *f) H5F_file_t *next; /* Temporary file pointer */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5F_efc_try_close) + FUNC_ENTER_NOAPI_NOINIT /* Sanity checks */ HDassert(f); |