diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2014-03-23 06:27:57 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2014-03-23 06:27:57 (GMT) |
| commit | f97d63cb95fa2595e5137a7ac6e0d1282fb5118b (patch) | |
| tree | 698d5f3e535b8f77e4ecfb2da9722ab0cb040386 /src/H5Olink.c | |
| parent | 67be45610fd450909038afea54f79e6a91c458cf (diff) | |
| download | hdf5-f97d63cb95fa2595e5137a7ac6e0d1282fb5118b.zip hdf5-f97d63cb95fa2595e5137a7ac6e0d1282fb5118b.tar.gz hdf5-f97d63cb95fa2595e5137a7ac6e0d1282fb5118b.tar.bz2 | |
[svn-r24869] Description:
Clean up more compiler warnings, plus merge a few Coverity bug fixes from
the hdf5_1_8_coverity branch back to the trunk:
r20877:
Purpose: Fix coverity issue 1723
Description:
Modified test_generate in hl/test_image to close file "f" before exit, even if
an error occurs.
r20879:
Issue 63: change check of return of H5Tget_nmembers to <=0. No need to go
futher if call fails as well as empty.
r20881:
Coverity #659 in Run 46: I changed the Line 442 where it tries to check whether
FLAG_PRINTED is TRUE. But it had just been set to FALSE. I took out the
condition check in the print statement.
Tested on:
Mac OSX/64 10.9.2 (amazon) w/C++, FORTRAN & Parallel
(too minor to require h5committest)
Diffstat (limited to 'src/H5Olink.c')
| -rw-r--r-- | src/H5Olink.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/H5Olink.c b/src/H5Olink.c index 4dda5fe..184f6b9 100644 --- a/src/H5Olink.c +++ b/src/H5Olink.c @@ -484,6 +484,9 @@ H5O_link_size(const H5F_t *f, hbool_t UNUSED disable_shared, const void *_mesg) FUNC_ENTER_NOAPI_NOINIT_NOERR + /* Sanity check */ + HDcompile_assert(sizeof(uint64_t) >= sizeof(size_t)); + /* Get name's length */ name_len = (uint64_t)HDstrlen(lnk->name); @@ -500,7 +503,7 @@ H5O_link_size(const H5F_t *f, hbool_t UNUSED disable_shared, const void *_mesg) /* Set return value */ ret_value = 1 + /* Version */ 1 + /* Link encoding flags */ - (lnk->type != H5L_TYPE_HARD ? 1 : 0) + /* Link type */ + (lnk->type != H5L_TYPE_HARD ? (size_t)1 : 0) + /* Link type */ (lnk->corder_valid ? 8 : 0) + /* Creation order */ (lnk->cset != H5T_CSET_ASCII ? 1 : 0) + /* Character set */ name_size + /* Name length */ |