diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2015-09-07 00:22:07 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2015-09-07 00:22:07 (GMT) |
| commit | a8df8470bbd6d5abd52f8c53b4d63e8add59adcc (patch) | |
| tree | ce51431f4652d02a9465f89df62bcd34e5ec6190 /src/H5Oalloc.c | |
| parent | ecfcf34b945ec2b2412ac5a991fbdaf6489c655e (diff) | |
| download | hdf5-a8df8470bbd6d5abd52f8c53b4d63e8add59adcc.zip hdf5-a8df8470bbd6d5abd52f8c53b4d63e8add59adcc.tar.gz hdf5-a8df8470bbd6d5abd52f8c53b4d63e8add59adcc.tar.bz2 | |
[svn-r27689] Merge of r27459 and r27460 from trunk
Minor warning cleanup
(27459) Renamed a few "h5tri_t extended" variables to "h5tri_t was_extended".
Apparently, "extended" is a typedef name someplace in the headers used on
Solaris, which causes potentially confusing warnings to be emitted.
(27460) Minor code cleanup in test/trefer.c
- Fixed an out-of-range char assignment.
- Added a couple of malloc() casts.
Tested on: h5committest
Diffstat (limited to 'src/H5Oalloc.c')
| -rw-r--r-- | src/H5Oalloc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5Oalloc.c b/src/H5Oalloc.c index 76f392d..e9d4f85 100644 --- a/src/H5Oalloc.c +++ b/src/H5Oalloc.c @@ -514,7 +514,7 @@ H5O_alloc_extend_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned chunkno, size_t aligned_size = H5O_ALIGN_OH(oh, size); uint8_t *old_image; /* Old address of chunk's image in memory */ size_t old_size; /* Old size of chunk */ - htri_t extended; /* If chunk can be extended */ + htri_t was_extended; /* If chunk can be extended */ size_t extend_msg; /* Index of null message to extend */ hbool_t extended_msg = FALSE; /* Whether an existing message was extended */ uint8_t new_size_flags = 0; /* New chunk #0 size flags */ @@ -592,11 +592,11 @@ H5O_alloc_extend_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned chunkno, HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header chunk") /* Determine whether the chunk can be extended */ - extended = H5MF_try_extend(f, dxpl_id, H5FD_MEM_OHDR, oh->chunk[chunkno].addr, + was_extended = H5MF_try_extend(f, dxpl_id, H5FD_MEM_OHDR, oh->chunk[chunkno].addr, (hsize_t)(oh->chunk[chunkno].size), (hsize_t)(delta + extra_prfx_size)); - if(extended < 0) /* error */ + if(was_extended < 0) /* error */ HGOTO_ERROR(H5E_OHDR, H5E_CANTEXTEND, FAIL, "can't tell if we can extend chunk") - else if(extended == FALSE) /* can't extend -- we are done */ + else if(was_extended == FALSE) /* can't extend -- we are done */ HGOTO_DONE(FALSE) /* Adjust object header prefix flags */ |