diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2012-07-26 20:03:12 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2012-07-26 20:03:12 (GMT) |
| commit | 0728b38ddd4d0c31269f26f5b600f4e569670f6f (patch) | |
| tree | dc6495de1a103f179a3cdae43ce6410468c1cee1 /src/H5Odbg.c | |
| parent | 0ea9a38644765aa4045b9110e86c5e50a5f24dac (diff) | |
| download | hdf5-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/H5Odbg.c')
| -rw-r--r-- | src/H5Odbg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Odbg.c b/src/H5Odbg.c index 5c07b64..5901c61 100644 --- a/src/H5Odbg.c +++ b/src/H5Odbg.c @@ -398,7 +398,7 @@ H5O_debug_real(H5F_t *f, hid_t dxpl_id, H5O_t *oh, haddr_t addr, FILE *stream, i if(0 == i) { if(H5F_addr_ne(oh->chunk[i].addr, addr)) HDfprintf(stream, "*** WRONG ADDRESS FOR CHUNK #0!\n"); - chunk_size = oh->chunk[i].size - H5O_SIZEOF_HDR(oh); + chunk_size = oh->chunk[i].size - (size_t)H5O_SIZEOF_HDR(oh); } /* end if */ else chunk_size = oh->chunk[i].size; @@ -424,7 +424,7 @@ H5O_debug_real(H5F_t *f, hid_t dxpl_id, H5O_t *oh, haddr_t addr, FILE *stream, i unsigned chunkno; /* Chunk for message */ /* Accumulate message's size to total */ - mesg_total += H5O_SIZEOF_MSGHDR_OH(oh) + oh->mesg[i].raw_size; + mesg_total += (size_t)H5O_SIZEOF_MSGHDR_OH(oh) + oh->mesg[i].raw_size; /* For version 2 object header, add size of "OCHK" for continuation chunk */ if (oh->mesg[i].type->id == H5O_CONT_ID) |