diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2012-02-10 19:48:08 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2012-02-10 19:48:08 (GMT) |
| commit | 5f94d17285913b2497d169cadfb639f300773407 (patch) | |
| tree | f4a96b86d8ac5d13411ca897e1377fb2f1808cb3 /src/H5SMcache.c | |
| parent | f16098f402139aa4e258542661c3003389803de9 (diff) | |
| download | hdf5-5f94d17285913b2497d169cadfb639f300773407.zip hdf5-5f94d17285913b2497d169cadfb639f300773407.tar.gz hdf5-5f94d17285913b2497d169cadfb639f300773407.tar.bz2 | |
[svn-r21925] Description:
Bring r21919-21924 from trunk to 1.8 branch: cleanup FUNC_ENTER macros,
etc.
Also removed Subversion mergeinfo tags from a few directories and files.
These are artifacts from non-root merges using pre-1.6 Subversion clients. (This
should fix the problem of unchanged directories looking "changed" during
checkins.)
Tested on:
Mac OSX/64 10.7.3 (amazon) w/debug & production
(daily tested on trunk)
Diffstat (limited to 'src/H5SMcache.c')
| -rw-r--r-- | src/H5SMcache.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/H5SMcache.c b/src/H5SMcache.c index 1dfbaab..d89af73 100644 --- a/src/H5SMcache.c +++ b/src/H5SMcache.c @@ -125,7 +125,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. @@ -254,7 +254,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); @@ -359,7 +359,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); @@ -391,7 +391,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. @@ -425,7 +425,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); @@ -466,7 +466,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); @@ -563,7 +563,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); @@ -653,7 +653,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); @@ -697,7 +697,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. @@ -731,7 +731,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); |