summaryrefslogtreecommitdiffstats
path: root/src/H5SMcache.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2012-02-09 03:13:27 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2012-02-09 03:13:27 (GMT)
commit9c9ee2008c10801c11bce8563894d9a30ba9a959 (patch)
treec2b89df08fa3895d3fae1a4ad87353f9aabee598 /src/H5SMcache.c
parenteb0e5f8c4ea29e674c97a8be048814e26379d4c1 (diff)
downloadhdf5-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/H5SMcache.c')
-rw-r--r--src/H5SMcache.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/H5SMcache.c b/src/H5SMcache.c
index 65fc359..9955f39 100644
--- a/src/H5SMcache.c
+++ b/src/H5SMcache.c
@@ -127,7 +127,7 @@ H5SM_table_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void UNUSED *udata)
size_t x; /* Counter variable for index headers */
H5SM_master_table_t *ret_value;
- FUNC_ENTER_NOAPI_NOINIT(H5SM_table_load)
+ FUNC_ENTER_NOAPI_NOINIT
/* Verify that we're reading version 0 of the table; this is the only
* version defined so far.
@@ -256,7 +256,7 @@ H5SM_table_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5SM_ma
uint8_t tbl_buf[H5SM_TBL_BUF_SIZE]; /* Buffer for table */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5SM_table_flush)
+ FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(f);
@@ -361,7 +361,7 @@ H5SM_table_dest(H5F_t UNUSED *f, H5SM_master_table_t* table)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5SM_table_dest)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(table);
@@ -393,7 +393,7 @@ H5SM_table_clear(H5F_t *f, H5SM_master_table_t *table, hbool_t destroy)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5SM_table_clear)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -427,7 +427,7 @@ done:
static herr_t
H5SM_table_size(const H5F_t UNUSED *f, const H5SM_master_table_t *table, size_t *size_ptr)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SM_table_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check arguments */
HDassert(f);
@@ -468,7 +468,7 @@ H5SM_list_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
size_t x; /* Counter variable for messages in list */
H5SM_list_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5SM_list_load)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(udata->header);
@@ -565,7 +565,7 @@ H5SM_list_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5SM_lis
uint8_t lst_buf[H5SM_LST_BUF_SIZE]; /* Buffer for list index */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5SM_list_flush)
+ FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(f);
@@ -655,7 +655,7 @@ H5SM_list_dest(H5F_t *f, H5SM_list_t* list)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5SM_list_dest)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(list);
@@ -699,7 +699,7 @@ H5SM_list_clear(H5F_t *f, H5SM_list_t *list, hbool_t destroy)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5SM_list_clear)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -733,7 +733,7 @@ done:
static herr_t
H5SM_list_size(const H5F_t UNUSED *f, const H5SM_list_t *list, size_t *size_ptr)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SM_list_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check arguments */
HDassert(f);