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/H5Pdeprec.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/H5Pdeprec.c')
| -rw-r--r-- | src/H5Pdeprec.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/H5Pdeprec.c b/src/H5Pdeprec.c index 5050c95..5d62d61 100644 --- a/src/H5Pdeprec.c +++ b/src/H5Pdeprec.c @@ -97,7 +97,7 @@ DESCRIPTION static herr_t H5P_init_deprec_interface(void) { - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_init_deprec_interface) + FUNC_ENTER_NOAPI_NOINIT_NOERR FUNC_LEAVE_NOAPI(H5P_init()) } /* H5P_init_deprec_interface() */ @@ -253,7 +253,7 @@ H5Pregister1(hid_t cls_id, const char *name, size_t size, void *def_value, H5P_genclass_t *orig_pclass; /* Original property class */ herr_t ret_value; /* Return value */ - FUNC_ENTER_API(H5Pregister1, FAIL); + FUNC_ENTER_API(FAIL) H5TRACE10("e", "i*sz*xxxxxxx", cls_id, name, size, def_value, prp_create, prp_set, prp_get, prp_delete, prp_copy, prp_close); @@ -285,7 +285,7 @@ H5Pregister1(hid_t cls_id, const char *name, size_t size, void *def_value, } /* end if */ done: - FUNC_LEAVE_API(ret_value); + FUNC_LEAVE_API(ret_value) } /* H5Pregister1() */ @@ -437,7 +437,7 @@ H5Pinsert1(hid_t plist_id, const char *name, size_t size, void *value, H5P_genplist_t *plist; /* Property list to modify */ herr_t ret_value; /* return value */ - FUNC_ENTER_API(H5Pinsert1, FAIL); + FUNC_ENTER_API(FAIL) H5TRACE9("e", "i*sz*xxxxxx", plist_id, name, size, value, prp_set, prp_get, prp_delete, prp_copy, prp_close); @@ -454,7 +454,7 @@ H5Pinsert1(hid_t plist_id, const char *name, size_t size, void *value, HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to register property in plist") done: - FUNC_LEAVE_API(ret_value); + FUNC_LEAVE_API(ret_value) } /* H5Pinsert1() */ #endif /* H5_NO_DEPRECATED_SYMBOLS */ |