diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-01-08 17:27:15 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-01-08 17:27:15 (GMT) |
| commit | 634c7c5a93abb49a56336eec9e842a0bd694f828 (patch) | |
| tree | d30f170a49ca3186bc8beddac7bf3523dfdb1ad3 /src/H5Pgcpl.c | |
| parent | 9b1f93283c32f81658cf40d0caeb5333c4db6ae9 (diff) | |
| download | hdf5-634c7c5a93abb49a56336eec9e842a0bd694f828.zip hdf5-634c7c5a93abb49a56336eec9e842a0bd694f828.tar.gz hdf5-634c7c5a93abb49a56336eec9e842a0bd694f828.tar.bz2 | |
[svn-r16279] Description:
Bring revision 16278 back from revise_chunks branch:
Update layout information in DCPL to unify all information in one
underlying property and switch to using H5O_layout_t for storing it, which
simplifies things considerably.
Also, fix many compiler warnings.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
(Original patch tested on many machines)
Diffstat (limited to 'src/H5Pgcpl.c')
| -rw-r--r-- | src/H5Pgcpl.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/H5Pgcpl.c b/src/H5Pgcpl.c index a4aff51..913c5f1 100644 --- a/src/H5Pgcpl.c +++ b/src/H5Pgcpl.c @@ -257,8 +257,8 @@ H5Pset_link_phase_change(hid_t plist_id, unsigned max_compact, unsigned min_dens ginfo.store_link_phase_change = TRUE; else ginfo.store_link_phase_change = FALSE; - ginfo.max_compact = max_compact; - ginfo.min_dense = min_dense; + ginfo.max_compact = (uint16_t)max_compact; + ginfo.min_dense = (uint16_t)min_dense; /* Set group info */ if(H5P_set(plist, H5G_CRT_GROUP_INFO_NAME, &ginfo) < 0) @@ -361,8 +361,8 @@ H5Pset_est_link_info(hid_t plist_id, unsigned est_num_entries, unsigned est_name ginfo.store_est_entry_info = TRUE; else ginfo.store_est_entry_info = FALSE; - ginfo.est_num_entries = est_num_entries; - ginfo.est_name_len = est_name_len; + ginfo.est_num_entries = (uint16_t)est_num_entries; + ginfo.est_name_len = (uint16_t)est_name_len; /* Set group info */ if(H5P_set(plist, H5G_CRT_GROUP_INFO_NAME, &ginfo) < 0) @@ -451,8 +451,8 @@ H5Pset_link_creation_order(hid_t plist_id, unsigned crt_order_flags) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get link info") /* Update fields */ - linfo.track_corder = (crt_order_flags & H5P_CRT_ORDER_TRACKED) ? TRUE : FALSE; - linfo.index_corder = (crt_order_flags & H5P_CRT_ORDER_INDEXED) ? TRUE : FALSE; + linfo.track_corder = (hbool_t)((crt_order_flags & H5P_CRT_ORDER_TRACKED) ? TRUE : FALSE); + linfo.index_corder = (hbool_t)((crt_order_flags & H5P_CRT_ORDER_INDEXED) ? TRUE : FALSE); /* Set link info */ if(H5P_set(plist, H5G_CRT_LINK_INFO_NAME, &linfo) < 0) |