diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2006-11-02 18:38:22 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2006-11-02 18:38:22 (GMT) |
| commit | 55b31c57b5fab7a8952041149774e60136391b57 (patch) | |
| tree | 1b1bbc4c37f6f2de57ee881abf52a82227ca14a9 /src/H5Pstrcpl.c | |
| parent | d90d6ffdce1f1e3426c6b7f5dc83809e09749079 (diff) | |
| download | hdf5-55b31c57b5fab7a8952041149774e60136391b57.zip hdf5-55b31c57b5fab7a8952041149774e60136391b57.tar.gz hdf5-55b31c57b5fab7a8952041149774e60136391b57.tar.bz2 | |
[svn-r12846] Description:
Further minor tweaking of property list class initialization macros, etc.
Tested on:
FreeBSD/32 4.11 (sleipnir) w/threadsafe & debugging turned on
Linux/32 2.4 (heping) w/FORTRAN & C++
Linux/64 2.4 (mir) w/build-all & 1.6 compat enabled
AIX/32 5.x (copper) w/FORTRAN & parallel
Diffstat (limited to 'src/H5Pstrcpl.c')
| -rw-r--r-- | src/H5Pstrcpl.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/H5Pstrcpl.c b/src/H5Pstrcpl.c index 46fe02d..f45c267 100644 --- a/src/H5Pstrcpl.c +++ b/src/H5Pstrcpl.c @@ -41,6 +41,11 @@ /* Local Macros */ /****************/ +/* ======== String creation properties ======== */ +/* Definitions for character set encoding property */ +#define H5P_STRCRT_CHAR_ENCODING_SIZE sizeof(H5T_cset_t) +#define H5P_STRCRT_CHAR_ENCODING_DEF H5F_DEFAULT_CSET + /******************/ /* Local Typedefs */ @@ -105,13 +110,13 @@ const H5P_libclass_t H5P_CLS_STRCRT[1] = {{ herr_t H5P_strcrt_reg_prop(H5P_genclass_t *pclass) { - H5T_cset_t char_encoding = H5P_CHAR_ENCODING_DEF; /* Default character set encoding */ + 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) /* Register character encoding */ - if(H5P_register(pclass, H5P_CHAR_ENCODING_NAME, H5P_CHAR_ENCODING_SIZE, + if(H5P_register(pclass, H5P_STRCRT_CHAR_ENCODING_NAME, H5P_STRCRT_CHAR_ENCODING_SIZE, &char_encoding, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class") @@ -152,7 +157,7 @@ H5Pset_char_encoding(hid_t plist_id, H5T_cset_t encoding) HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID") /* Set the character encoding */ - if(H5P_set(plist, H5P_CHAR_ENCODING_NAME, &encoding) < 0) + if(H5P_set(plist, H5P_STRCRT_CHAR_ENCODING_NAME, &encoding) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set character encoding") done: @@ -186,7 +191,7 @@ H5Pget_char_encoding(hid_t plist_id, H5T_cset_t *encoding /*out*/) /* Get value */ if(encoding) - if(H5P_get(plist, H5P_CHAR_ENCODING_NAME, encoding) < 0) + if(H5P_get(plist, H5P_STRCRT_CHAR_ENCODING_NAME, encoding) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get character encoding flag") done: |