diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2006-11-29 04:44:28 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2006-11-29 04:44:28 (GMT) |
| commit | ce05f32a3d33fad5401b6d1d291676771fc300dd (patch) | |
| tree | 5f6477a8e166d056dc85365ab2cf55e2ed0e46c4 /src | |
| parent | 2f3344a0495c09448e7fac023c8d91a567110a48 (diff) | |
| download | hdf5-ce05f32a3d33fad5401b6d1d291676771fc300dd.zip hdf5-ce05f32a3d33fad5401b6d1d291676771fc300dd.tar.gz hdf5-ce05f32a3d33fad5401b6d1d291676771fc300dd.tar.bz2 | |
[svn-r12995] Description:
Make the memory size of the max. compact & min. dense attribute storage
variables align with the property list size, instead of the size on disk, to
better handle big-endian machines.
Tested on:
FreeBSD/32 4.11 (sleipnir)
Linux/32 2.4 (heping)
Linux/64 2.4 (mir)
AIX/32 5.? (copper)
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5O.c | 8 | ||||
| -rw-r--r-- | src/H5Opkg.h | 4 |
2 files changed, 4 insertions, 8 deletions
@@ -4014,13 +4014,9 @@ H5O_get_create_plist(const H5O_loc_t *oloc, hid_t dxpl_id, H5P_genplist_t *oc_pl /* Set property values, if they were used for the object */ if(oh->version > H5O_VERSION_1) { - unsigned max_compact = oh->max_compact; /* Alias for setting the max. compact value */ - unsigned min_dense = oh->min_dense; /* Alias for setting the min. dense value */ - - /* Set the property list values with aliases, so the sizes are correct */ - if(H5P_set(oc_plist, H5O_CRT_ATTR_MAX_COMPACT_NAME, &max_compact) < 0) + if(H5P_set(oc_plist, H5O_CRT_ATTR_MAX_COMPACT_NAME, &oh->max_compact) < 0) HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, FAIL, "can't set max. # of compact attributes in property list") - if(H5P_set(oc_plist, H5O_CRT_ATTR_MIN_DENSE_NAME, &min_dense) < 0) + if(H5P_set(oc_plist, H5O_CRT_ATTR_MIN_DENSE_NAME, &oh->min_dense) < 0) HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, FAIL, "can't set min. # of dense attributes in property list") } /* end if */ diff --git a/src/H5Opkg.h b/src/H5Opkg.h index e8b72e9..b1c4498 100644 --- a/src/H5Opkg.h +++ b/src/H5Opkg.h @@ -209,8 +209,8 @@ struct H5O_t { time_t btime; /*birth time */ /* Attribute information (stored, for versions > 1) */ - uint16_t max_compact; /* Maximum # of compact attributes */ - uint16_t min_dense; /* Minimum # of "dense" attributes */ + unsigned max_compact; /* Maximum # of compact attributes */ + unsigned min_dense; /* Minimum # of "dense" attributes */ hsize_t nattrs; /* Number of attributes in the group */ haddr_t attr_fheap_addr; /* Address of fractal heap for storing "dense" attributes */ haddr_t name_bt2_addr; /* Address of v2 B-tree for indexing names of attributes */ |