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/H5MPtest.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/H5MPtest.c')
| -rw-r--r-- | src/H5MPtest.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/H5MPtest.c b/src/H5MPtest.c index 2232b94..ccbd140 100644 --- a/src/H5MPtest.c +++ b/src/H5MPtest.c @@ -51,7 +51,7 @@ herr_t H5MP_get_pool_free_size(const H5MP_pool_t *mp, size_t *free_size) { - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5MP_get_pool_free_size) + FUNC_ENTER_NOAPI_NOINIT_NOERR /* Check arguments. */ HDassert(mp); @@ -83,7 +83,7 @@ H5MP_get_pool_free_size(const H5MP_pool_t *mp, size_t *free_size) herr_t H5MP_get_pool_first_page(const H5MP_pool_t *mp, H5MP_page_t **page) { - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5MP_get_pool_first_page) + FUNC_ENTER_NOAPI_NOINIT_NOERR /* Check arguments. */ HDassert(mp); @@ -122,7 +122,7 @@ H5MP_pool_is_free_size_correct(const H5MP_pool_t *mp) size_t pool_free; /* Size of pages' free space */ htri_t ret_value = TRUE; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5MP_pool_is_free_size_correct) + FUNC_ENTER_NOAPI_NOINIT_NOERR /* Check arguments. */ HDassert(mp); @@ -191,7 +191,7 @@ done: herr_t H5MP_get_page_free_size(const H5MP_page_t *page, size_t *free_size) { - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5MP_get_page_free_size) + FUNC_ENTER_NOAPI_NOINIT_NOERR /* Check arguments. */ HDassert(page); @@ -223,7 +223,7 @@ H5MP_get_page_free_size(const H5MP_page_t *page, size_t *free_size) herr_t H5MP_get_page_next_page(const H5MP_page_t *page, H5MP_page_t **next_page) { - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5MP_get_page_next_page) + FUNC_ENTER_NOAPI_NOINIT_NOERR /* Check arguments. */ HDassert(page); |