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/H5Ochunk.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/H5Ochunk.c')
| -rw-r--r-- | src/H5Ochunk.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/H5Ochunk.c b/src/H5Ochunk.c index 488ce13..d6d4a1a 100644 --- a/src/H5Ochunk.c +++ b/src/H5Ochunk.c @@ -97,7 +97,7 @@ H5O_chunk_add(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned idx) H5O_chunk_proxy_t *chk_proxy = NULL; /* Proxy for chunk, to mark it dirty in the cache */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5O_chunk_add, FAIL) + FUNC_ENTER_NOAPI(FAIL) /* check args */ HDassert(f); @@ -151,7 +151,7 @@ H5O_chunk_protect(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned idx) H5O_chunk_proxy_t *chk_proxy = NULL; /* Proxy for protected chunk */ H5O_chunk_proxy_t *ret_value; /* Return value */ - FUNC_ENTER_NOAPI(H5O_chunk_protect, NULL) + FUNC_ENTER_NOAPI(NULL) /* check args */ HDassert(f); @@ -225,7 +225,7 @@ H5O_chunk_unprotect(H5F_t *f, hid_t dxpl_id, H5O_chunk_proxy_t *chk_proxy, { herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5O_chunk_unprotect, FAIL) + FUNC_ENTER_NOAPI(FAIL) /* check args */ HDassert(f); @@ -277,7 +277,7 @@ H5O_chunk_resize(H5O_t *oh, H5O_chunk_proxy_t *chk_proxy) { herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5O_chunk_resize, FAIL) + FUNC_ENTER_NOAPI(FAIL) /* check args */ HDassert(oh); @@ -321,7 +321,7 @@ H5O_chunk_update_idx(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned idx) H5O_chk_cache_ud_t chk_udata; /* User data for loading chunk */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5O_chunk_update_idx, FAIL) + FUNC_ENTER_NOAPI(FAIL) /* check args */ HDassert(f); @@ -373,7 +373,7 @@ H5O_chunk_delete(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned idx) H5O_chk_cache_ud_t chk_udata; /* User data for loading chunk */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5O_chunk_delete, FAIL) + FUNC_ENTER_NOAPI(FAIL) /* check args */ HDassert(f); |