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/H5Doh.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/H5Doh.c')
| -rw-r--r-- | src/H5Doh.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/H5Doh.c b/src/H5Doh.c index 6a8a5cd..6496729 100644 --- a/src/H5Doh.c +++ b/src/H5Doh.c @@ -108,7 +108,7 @@ H5O_dset_get_copy_file_udata(void) { void *ret_value; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5O_dset_get_copy_file_udata) + FUNC_ENTER_NOAPI_NOINIT /* Allocate space for the 'copy file' user data for copying datasets */ if(NULL == (ret_value = H5FL_CALLOC(H5D_copy_file_ud_t))) @@ -141,7 +141,7 @@ H5O_dset_free_copy_file_udata(void *_udata) { H5D_copy_file_ud_t *udata = (H5D_copy_file_ud_t *)_udata; - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_dset_free_copy_file_udata) + FUNC_ENTER_NOAPI_NOINIT_NOERR /* Sanity check */ HDassert(udata); @@ -182,13 +182,13 @@ H5O_dset_free_copy_file_udata(void *_udata) * *------------------------------------------------------------------------- */ -htri_t +static htri_t H5O_dset_isa(H5O_t *oh) { htri_t exists; /* Flag if header message of interest exists */ htri_t ret_value = TRUE; /* Return value */ - FUNC_ENTER_NOAPI(H5O_dset_isa, FAIL) + FUNC_ENTER_NOAPI_NOINIT HDassert(oh); @@ -230,7 +230,7 @@ H5O_dset_open(const H5G_loc_t *obj_loc, hid_t lapl_id, hid_t dxpl_id, hbool_t ap hid_t dapl_id; /* dapl to use to open this dataset */ hid_t ret_value; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5O_dset_open) + FUNC_ENTER_NOAPI_NOINIT HDassert(obj_loc); @@ -283,7 +283,7 @@ H5O_dset_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc, hid_t dxpl_id) H5D_t *dset = NULL; /* New dataset created */ void *ret_value; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5O_dset_create) + FUNC_ENTER_NOAPI_NOINIT /* Sanity checks */ HDassert(f); @@ -331,7 +331,7 @@ H5O_dset_get_oloc(hid_t obj_id) H5D_t *dset; /* Dataset opened */ H5O_loc_t *ret_value; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5O_dset_get_oloc) + FUNC_ENTER_NOAPI_NOINIT /* Get the dataset */ if(NULL == (dset = (H5D_t *)H5I_object(obj_id))) @@ -376,7 +376,7 @@ H5O_dset_bh_info(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5_ih_info_t *bh_info) htri_t exists; /* Flag if header message of interest exists */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5O_dset_bh_info) + FUNC_ENTER_NOAPI_NOINIT /* Sanity check */ HDassert(f); |