summaryrefslogtreecommitdiffstats
path: root/src/H5Olayout.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2015-08-29 01:43:37 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2015-08-29 01:43:37 (GMT)
commitb68b9d8786f6b9bf4bd52a3b8c87fa64933803b1 (patch)
tree32b5219b2bea7df6846f83ebf725f7310f991206 /src/H5Olayout.c
parent1847391fc51728811407f3e1586213758c1d0e89 (diff)
downloadhdf5-b68b9d8786f6b9bf4bd52a3b8c87fa64933803b1.zip
hdf5-b68b9d8786f6b9bf4bd52a3b8c87fa64933803b1.tar.gz
hdf5-b68b9d8786f6b9bf4bd52a3b8c87fa64933803b1.tar.bz2
[svn-r27612] Description:
Align w/vds branch: Whitespace cleanup, move common code for opening a dataset into a new routine, misc. style cleanups. Tested on: MacOSX/64 10.10.5 (amazon) w/serial & parallel (h5committest upcoming)
Diffstat (limited to 'src/H5Olayout.c')
-rw-r--r--src/H5Olayout.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5Olayout.c b/src/H5Olayout.c
index 8821694..b499e31 100644
--- a/src/H5Olayout.c
+++ b/src/H5Olayout.c
@@ -190,7 +190,7 @@ H5O_layout_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *
} /* end if */
else {
/* Layout class */
- mesg->type = (H5D_layout_t)*p++;
+ mesg->type = mesg->storage.type = (H5D_layout_t)*p++;
/* Interpret the rest of the message according to the layout class */
switch(mesg->type) {
@@ -686,7 +686,7 @@ H5O_layout_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const vo
FILE * stream, int indent, int fwidth)
{
const H5O_layout_t *mesg = (const H5O_layout_t *) _mesg;
- unsigned u;
+ size_t u;
FUNC_ENTER_NOAPI_NOINIT_NOERR
@@ -709,7 +709,7 @@ H5O_layout_debug(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, const vo
"Number of dimensions:",
(unsigned long)(mesg->u.chunk.ndims));
HDfprintf(stream, "%*s%-*s {", indent, "", fwidth, "Size:");
- for(u = 0; u < mesg->u.chunk.ndims; u++)
+ for(u = 0; u < (size_t)mesg->u.chunk.ndims; u++)
HDfprintf(stream, "%s%lu", u ? ", " : "", (unsigned long)(mesg->u.chunk.dim[u]));
HDfprintf(stream, "}\n");