summaryrefslogtreecommitdiffstats
path: root/src/H5Olinfo.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2012-07-26 20:03:12 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2012-07-26 20:03:12 (GMT)
commit0728b38ddd4d0c31269f26f5b600f4e569670f6f (patch)
treedc6495de1a103f179a3cdae43ce6410468c1cee1 /src/H5Olinfo.c
parent0ea9a38644765aa4045b9110e86c5e50a5f24dac (diff)
downloadhdf5-0728b38ddd4d0c31269f26f5b600f4e569670f6f.zip
hdf5-0728b38ddd4d0c31269f26f5b600f4e569670f6f.tar.gz
hdf5-0728b38ddd4d0c31269f26f5b600f4e569670f6f.tar.bz2
[svn-r22609] Description:
Bring r22608 from trunk to 1.8 branch: Switch propert list/class iteration from internal to external form of iteration, cleaning up and simplifying the code a bit. Bring other general improvements from plist_encode_decode branch back to trunk. Clean up many warnings. Tested on: Mac OSX/64 10.7.4 (amazon) w/gcc 4.7, debug and C++ & FORTRAN (too minor to require h5committest)
Diffstat (limited to 'src/H5Olinfo.c')
-rw-r--r--src/H5Olinfo.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/H5Olinfo.c b/src/H5Olinfo.c
index 8eabc1b..77df8f6 100644
--- a/src/H5Olinfo.c
+++ b/src/H5Olinfo.c
@@ -206,7 +206,7 @@ H5O_linfo_encode(H5F_t *f, hbool_t UNUSED disable_shared, uint8_t *p, const void
/* The flags for the link indices */
index_flags = linfo->track_corder ? H5O_LINFO_TRACK_CORDER : 0;
- index_flags |= linfo->index_corder ? H5O_LINFO_INDEX_CORDER : 0;
+ index_flags = (uint8_t)(index_flags | (linfo->index_corder ? H5O_LINFO_INDEX_CORDER : 0));
*p++ = index_flags;
/* Max. link creation order value for the group, if tracked */
@@ -296,10 +296,10 @@ H5O_linfo_size(const H5F_t *f, hbool_t UNUSED disable_shared, const void *_mesg)
/* Set return value */
ret_value = 1 /* Version */
+ 1 /* Index flags */
- + (linfo->track_corder ? 8 : 0) /* Curr. max. creation order value */
- + H5F_SIZEOF_ADDR(f) /* Address of fractal heap to store "dense" links */
- + H5F_SIZEOF_ADDR(f) /* Address of v2 B-tree for indexing names of links */
- + (linfo->index_corder ? H5F_SIZEOF_ADDR(f) : 0); /* Address of v2 B-tree for indexing creation order values of links */
+ + (linfo->track_corder ? (size_t)8 : 0) /* Curr. max. creation order value */
+ + (size_t)H5F_SIZEOF_ADDR(f) /* Address of fractal heap to store "dense" links */
+ + (size_t)H5F_SIZEOF_ADDR(f) /* Address of v2 B-tree for indexing names of links */
+ + (linfo->index_corder ? (size_t)H5F_SIZEOF_ADDR(f) : 0); /* Address of v2 B-tree for indexing creation order values of links */
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5O_linfo_size() */