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/H5FDint.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/H5FDint.c')
| -rw-r--r-- | src/H5FDint.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/H5FDint.c b/src/H5FDint.c index 74b3bf6..09af4ed 100644 --- a/src/H5FDint.c +++ b/src/H5FDint.c @@ -97,7 +97,7 @@ DESCRIPTION static herr_t H5FD_int_init_interface(void) { - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_int_init_interface) + FUNC_ENTER_NOAPI_NOINIT_NOERR FUNC_LEAVE_NOAPI(H5FD_init()) } /* H5FD_int_init_interface() */ @@ -122,7 +122,7 @@ H5FD_read(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, haddr_t addr, { herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5FD_read, FAIL) + FUNC_ENTER_NOAPI(FAIL) HDassert(file && file->cls); HDassert(H5I_GENPROP_LST == H5I_get_type(dxpl_id)); @@ -165,7 +165,7 @@ H5FD_write(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, haddr_t addr, { herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5FD_write, FAIL) + FUNC_ENTER_NOAPI(FAIL) HDassert(file && file->cls); HDassert(H5I_GENPROP_LST == H5I_get_type(dxpl_id)); @@ -212,7 +212,7 @@ H5FD_set_eoa(H5FD_t *file, H5FD_mem_t type, haddr_t addr) { herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5FD_set_eoa, FAIL) + FUNC_ENTER_NOAPI(FAIL) HDassert(file && file->cls); HDassert(H5F_addr_defined(addr) && addr <= file->maxaddr); @@ -249,7 +249,7 @@ H5FD_get_eoa(const H5FD_t *file, H5FD_mem_t type) { haddr_t ret_value; - FUNC_ENTER_NOAPI(H5FD_get_eoa, HADDR_UNDEF) + FUNC_ENTER_NOAPI(HADDR_UNDEF) HDassert(file && file->cls); @@ -291,7 +291,7 @@ H5FD_get_eof(const H5FD_t *file) { haddr_t ret_value; - FUNC_ENTER_NOAPI(H5FD_get_eof, HADDR_UNDEF) + FUNC_ENTER_NOAPI(HADDR_UNDEF) HDassert(file && file->cls); |