summaryrefslogtreecommitdiffstats
path: root/src/H5Pgcpl.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2009-01-08 17:56:57 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2009-01-08 17:56:57 (GMT)
commitab2ff6eda496173e038d97685f96dd2de9e3df29 (patch)
tree14c6e9b0f608eacfb3a6e22ea73cc4effcf34968 /src/H5Pgcpl.c
parent416af901799f3ab85b1578696ece3c319877add1 (diff)
downloadhdf5-ab2ff6eda496173e038d97685f96dd2de9e3df29.zip
hdf5-ab2ff6eda496173e038d97685f96dd2de9e3df29.tar.gz
hdf5-ab2ff6eda496173e038d97685f96dd2de9e3df29.tar.bz2
[svn-r16280] 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.c12
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)