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/H5Adeprec.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/H5Adeprec.c')
| -rw-r--r-- | src/H5Adeprec.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/H5Adeprec.c b/src/H5Adeprec.c index b289ae0..22faaa2 100644 --- a/src/H5Adeprec.c +++ b/src/H5Adeprec.c @@ -100,7 +100,7 @@ DESCRIPTION static herr_t H5A_init_deprec_interface(void) { - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_init_deprec_interface) + FUNC_ENTER_NOAPI_NOINIT FUNC_LEAVE_NOAPI(H5A_init()) } /* H5A_init_deprec_interface() */ @@ -143,7 +143,7 @@ H5Acreate1(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, H5S_t *space; /* Dataspace to use for attribute */ hid_t ret_value; /* Return value */ - FUNC_ENTER_API(H5Acreate1, FAIL) + FUNC_ENTER_API(FAIL) H5TRACE5("i", "i*siii", loc_id, name, type_id, space_id, plist_id); /* check arguments */ @@ -198,7 +198,7 @@ H5Aopen_name(hid_t loc_id, const char *name) H5A_t *attr = NULL; /* Attribute opened */ hid_t ret_value; - FUNC_ENTER_API(H5Aopen_name, FAIL) + FUNC_ENTER_API(FAIL) H5TRACE2("i", "i*s", loc_id, name); /* check arguments */ @@ -256,7 +256,7 @@ H5Aopen_idx(hid_t loc_id, unsigned idx) H5A_t *attr = NULL; /* Attribute opened */ hid_t ret_value; - FUNC_ENTER_API(H5Aopen_idx, FAIL) + FUNC_ENTER_API(FAIL) H5TRACE2("i", "iIu", loc_id, idx); /* check arguments */ @@ -308,7 +308,7 @@ H5Aget_num_attrs(hid_t loc_id) void *obj; int ret_value; - FUNC_ENTER_API(H5Aget_num_attrs, FAIL) + FUNC_ENTER_API(FAIL) H5TRACE1("Is", "i", loc_id); /* check arguments */ @@ -405,7 +405,7 @@ H5Aiterate1(hid_t loc_id, unsigned *attr_num, H5A_operator1_t op, void *op_data) hsize_t last_attr; /* Index of last attribute examined */ herr_t ret_value; /* Return value */ - FUNC_ENTER_API(H5Aiterate1, FAIL) + FUNC_ENTER_API(FAIL) H5TRACE4("e", "i*Iux*x", loc_id, attr_num, op, op_data); /* check arguments */ |