diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2014-05-17 03:22:51 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2014-05-17 03:22:51 (GMT) |
| commit | a613b70f93595fb8eacbe3ac076fe4d66f294d4f (patch) | |
| tree | f2f4fd54a635c6df6039265f45c8c1bef3e28127 /src | |
| parent | 896a5e7992a8419b4214406397093ac1c2bf9eab (diff) | |
| download | hdf5-a613b70f93595fb8eacbe3ac076fe4d66f294d4f.zip hdf5-a613b70f93595fb8eacbe3ac076fe4d66f294d4f.tar.gz hdf5-a613b70f93595fb8eacbe3ac076fe4d66f294d4f.tar.bz2 | |
[svn-r25197] Description:
Bring changes from hdf5_1_8_coverity branch back to trunk:
r20878:
Issue 76: Check if H5Tget_nmembers(type) fails and simply return(FALSE). Also move printf to after check.
r20880:
Issue 192: Create ret_val var set to -1. Add out label for failures to jump to, return ret_val at bottom.
r20882:
Fixes for coverity:
1) bug #1679: remove dead code in test/mf.c
2) bug #1680: remove dead code in tools/lib/h5diff_dset.c
r20883:
Fix coverity issue 585
Description:
Changed variable "c" in processStrData in h5import.c to an int, to match fgetc
return value, and removed call to feof, instead checking if c == EOF.
Tested on:
MacOSX/64 10.9.3 (amazon) w/C++, FORTRAN & parallel
(too minor to require h5committest)
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5Dchunk.c | 5 | ||||
| -rw-r--r-- | src/H5Dmpio.c | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c index 92db446..e93d627 100644 --- a/src/H5Dchunk.c +++ b/src/H5Dchunk.c @@ -385,10 +385,9 @@ H5D__chunk_direct_write(const H5D_t *dset, hid_t dxpl_id, uint32_t filters, hsiz if(H5F_block_write(dset->oloc.file, H5FD_MEM_DRAW, udata.addr, data_size, dxpl_id, buf) < 0) HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "unable to write raw data to file") - done: FUNC_LEAVE_NOAPI_TAG(ret_value, FAIL) -} +} /* end H5D__chunk_direct_write() */ /*------------------------------------------------------------------------- @@ -2798,7 +2797,7 @@ void * H5D__chunk_lock(const H5D_io_info_t *io_info, H5D_chunk_ud_t *udata, hbool_t relax) { - const H5D_t *dset = io_info->dset; /* Local pointer to the dataset info */ + const H5D_t *dset = io_info->dset; /* Local pointer to the dataset info */ const H5O_pline_t *pline = &(dset->shared->dcpl_cache.pline); /* I/O pipeline info - always equal to the pline passed to H5D__chunk_alloc */ const H5O_layout_t *layout = &(dset->shared->layout); /* Dataset layout */ const H5O_fill_t *fill = &(dset->shared->dcpl_cache.fill); /* Fill value info */ diff --git a/src/H5Dmpio.c b/src/H5Dmpio.c index c294e42..a5e8903 100644 --- a/src/H5Dmpio.c +++ b/src/H5Dmpio.c @@ -1308,8 +1308,6 @@ done: } /* end H5D__multi_chunk_collective_io */ - - /*------------------------------------------------------------------------- * Function: H5D__inter_collective_io * |