diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2014-04-23 16:30:25 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2014-04-23 16:30:25 (GMT) |
commit | 7b6eae2ddf3ee87b642dc1de5bdf116d96b8329e (patch) | |
tree | 230419cc151acffd01d5b094cfc72ecef40762f1 /src/H5T.c | |
parent | 3dc1e6dd38d665409560f79af6863019ebaa91d8 (diff) | |
download | hdf5-7b6eae2ddf3ee87b642dc1de5bdf116d96b8329e.zip hdf5-7b6eae2ddf3ee87b642dc1de5bdf116d96b8329e.tar.gz hdf5-7b6eae2ddf3ee87b642dc1de5bdf116d96b8329e.tar.bz2 |
[svn-r25084] Description:
Begin process of migrating from using property list IDs internally to the
library to using the internal generic property list data structure.
Tested on:
Mac OSX/64 10.9.2 (amazon) w/C++, FORTRAN & parallel
(h5committest forthcoming)
Diffstat (limited to 'src/H5T.c')
-rw-r--r-- | src/H5T.c | 15 |
1 files changed, 5 insertions, 10 deletions
@@ -770,7 +770,6 @@ H5T_init_interface(void) hsize_t dim[1]={1}; /* Dimension info for array datatype */ herr_t status; unsigned copied_dtype=1; /* Flag to indicate whether datatype was copied or allocated (for error cleanup) */ - H5P_genclass_t *crt_pclass; /* Property list class for datatype creation properties */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -1347,21 +1346,17 @@ H5T_init_interface(void) if (status<0) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to register conversion function(s)") - /* ========== Datatype Creation Property Class Initialization ============*/ - HDassert(H5P_CLS_DATATYPE_CREATE_g!=-1); - - /* Get the pointer to group creation class */ - if(NULL == (crt_pclass = (H5P_genclass_t *)H5I_object(H5P_CLS_DATATYPE_CREATE_g))) - HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list class") - /* Register datatype creation property class properties here. See similar * code in H5D_init_interface(), etc. for example. */ /* Only register the default property list if it hasn't been created yet */ - if(H5P_LST_DATATYPE_CREATE_g == (-1)) { + if(H5P_LST_DATATYPE_CREATE_ID_g == (-1)) { + /* ========== Datatype Creation Property Class Initialization ============*/ + HDassert(H5P_CLS_DATATYPE_CREATE_g != NULL); + /* Register the default datatype creation property list */ - if((H5P_LST_DATATYPE_CREATE_g = H5P_create_id(crt_pclass, FALSE)) < 0) + if((H5P_LST_DATATYPE_CREATE_ID_g = H5P_create_id(H5P_CLS_DATATYPE_CREATE_g, FALSE)) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "can't insert property into class") } /* end if */ |