diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2012-02-09 03:13:27 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2012-02-09 03:13:27 (GMT) |
| commit | 9c9ee2008c10801c11bce8563894d9a30ba9a959 (patch) | |
| tree | c2b89df08fa3895d3fae1a4ad87353f9aabee598 /src/H5Pstrcpl.c | |
| parent | eb0e5f8c4ea29e674c97a8be048814e26379d4c1 (diff) | |
| download | hdf5-9c9ee2008c10801c11bce8563894d9a30ba9a959.zip hdf5-9c9ee2008c10801c11bce8563894d9a30ba9a959.tar.gz hdf5-9c9ee2008c10801c11bce8563894d9a30ba9a959.tar.bz2 | |
[svn-r21919] Description:
Refactor function name macros and simplify the FUNC_ENTER macros, to clear
away the cruft and prepare for further cleanups.
Tested on:
Mac OSX/64 10.7.3 (amazon) w/debug, production & parallel
Diffstat (limited to 'src/H5Pstrcpl.c')
| -rw-r--r-- | src/H5Pstrcpl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/H5Pstrcpl.c b/src/H5Pstrcpl.c index 5125511..91cf70b 100644 --- a/src/H5Pstrcpl.c +++ b/src/H5Pstrcpl.c @@ -114,7 +114,7 @@ H5P_strcrt_reg_prop(H5P_genclass_t *pclass) H5T_cset_t char_encoding = H5P_STRCRT_CHAR_ENCODING_DEF; /* Default character set encoding */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5P_strcrt_reg_prop, FAIL) + FUNC_ENTER_NOAPI(FAIL) /* Register character encoding */ if(H5P_register_real(pclass, H5P_STRCRT_CHAR_ENCODING_NAME, H5P_STRCRT_CHAR_ENCODING_SIZE, &char_encoding, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0) @@ -145,7 +145,7 @@ H5Pset_char_encoding(hid_t plist_id, H5T_cset_t encoding) H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER_API(H5Pset_char_encoding, FAIL); + FUNC_ENTER_API(FAIL) H5TRACE2("e", "iTc", plist_id, encoding); /* Check arguments */ @@ -161,7 +161,7 @@ H5Pset_char_encoding(hid_t plist_id, H5T_cset_t encoding) HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set character encoding") done: - FUNC_LEAVE_API(ret_value); + FUNC_LEAVE_API(ret_value) } /* end H5P_set_char_encoding() */ @@ -182,7 +182,7 @@ H5Pget_char_encoding(hid_t plist_id, H5T_cset_t *encoding /*out*/) H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value = SUCCEED; /* return value */ - FUNC_ENTER_API(H5Pget_char_encoding, FAIL); + FUNC_ENTER_API(FAIL) H5TRACE2("e", "ix", plist_id, encoding); /* Get the plist structure */ @@ -195,6 +195,6 @@ H5Pget_char_encoding(hid_t plist_id, H5T_cset_t *encoding /*out*/) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get character encoding flag") done: - FUNC_LEAVE_API(ret_value); + FUNC_LEAVE_API(ret_value) } /* end H5Pget_char_encoding() */ |