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/H5Toh.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/H5Toh.c')
| -rw-r--r-- | src/H5Toh.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/H5Toh.c b/src/H5Toh.c index 886acc1..5878075 100644 --- a/src/H5Toh.c +++ b/src/H5Toh.c @@ -98,12 +98,12 @@ const H5O_obj_class_t H5O_OBJ_DATATYPE[1] = {{ * *------------------------------------------------------------------------- */ -htri_t +static htri_t H5O_dtype_isa(struct H5O_t *oh) { htri_t ret_value; /* Return value */ - FUNC_ENTER_NOAPI(H5O_dtype_isa, FAIL) + FUNC_ENTER_NOAPI_NOINIT HDassert(oh); @@ -134,7 +134,7 @@ H5O_dtype_open(const H5G_loc_t *obj_loc, hid_t UNUSED lapl_id, hid_t dxpl_id, hb H5T_t *type = NULL; /* Datatype opened */ hid_t ret_value; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5O_dtype_open) + FUNC_ENTER_NOAPI_NOINIT HDassert(obj_loc); @@ -174,7 +174,7 @@ H5O_dtype_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc, hid_t dxpl_id) H5T_obj_create_t *crt_info = (H5T_obj_create_t *)_crt_info; /* Named datatype creation parameters */ void *ret_value; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5O_dtype_create) + FUNC_ENTER_NOAPI_NOINIT /* Sanity checks */ HDassert(f); @@ -218,7 +218,7 @@ H5O_dtype_get_oloc(hid_t obj_id) H5T_t *type; /* Datatype opened */ H5O_loc_t *ret_value; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5O_dtype_get_oloc) + FUNC_ENTER_NOAPI_NOINIT /* Get the datatype */ if(NULL == (type = (H5T_t *)H5I_object(obj_id))) |