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/H5Otest.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/H5Otest.c')
| -rw-r--r-- | src/H5Otest.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/H5Otest.c b/src/H5Otest.c index 83c8dff..0971c85 100644 --- a/src/H5Otest.c +++ b/src/H5Otest.c @@ -101,7 +101,7 @@ H5O_is_attr_dense_test(hid_t oid) H5O_loc_t *loc; /* Pointer to object's location */ htri_t ret_value; /* Return value */ - FUNC_ENTER_NOAPI(H5O_is_attr_dense_test, FAIL) + FUNC_ENTER_NOAPI(FAIL) /* Get object location for object */ if(NULL == (loc = H5O_get_loc(oid))) @@ -166,7 +166,7 @@ H5O_is_attr_empty_test(hid_t oid) hsize_t nattrs; /* Number of attributes */ htri_t ret_value; /* Return value */ - FUNC_ENTER_NOAPI(H5O_is_attr_empty_test, FAIL) + FUNC_ENTER_NOAPI(FAIL) /* Get object location for object */ if(NULL == (loc = H5O_get_loc(oid))) @@ -253,7 +253,7 @@ H5O_num_attrs_test(hid_t oid, hsize_t *nattrs) hsize_t obj_nattrs; /* Number of attributes */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5O_num_attrs_test, FAIL) + FUNC_ENTER_NOAPI(FAIL) /* Get object location for object */ if(NULL == (loc = H5O_get_loc(oid))) @@ -339,7 +339,7 @@ H5O_attr_dense_info_test(hid_t oid, hsize_t *name_count, hsize_t *corder_count) H5O_loc_t *loc; /* Pointer to object's location */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5O_attr_dense_info_test, FAIL) + FUNC_ENTER_NOAPI(FAIL) /* Get object location for object */ if(NULL == (loc = H5O_get_loc(oid))) @@ -427,7 +427,7 @@ H5O_check_msg_marked_test(hid_t oid, hbool_t flag_val) unsigned idx; /* Index of message */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5O_check_msg_marked_test, FAIL) + FUNC_ENTER_NOAPI(FAIL) /* Get object location for object */ if(NULL == (loc = H5O_get_loc(oid))) @@ -490,7 +490,7 @@ H5O_expunge_chunks_test(const H5O_loc_t *loc, hid_t dxpl_id) unsigned u; /* Local index variable */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5O_expunge_chunks_test, FAIL) + FUNC_ENTER_NOAPI(FAIL) /* Get the object header */ if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_WRITE))) @@ -546,7 +546,7 @@ H5O_get_rc(const H5O_loc_t *loc, hid_t dxpl_id, unsigned *rc) H5O_t *oh = NULL; /* Object header */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5O_get_rc, FAIL) + FUNC_ENTER_NOAPI(FAIL) /* Sanity check */ HDassert(loc); |