diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2014-05-18 03:29:30 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2014-05-18 03:29:30 (GMT) |
| commit | a9d99b0539a1bb858e435e46adca138a8072a79e (patch) | |
| tree | 2431f36aa93e8e634b2cbb4a77a7355b236f7ed1 /src/H5Dchunk.c | |
| parent | d55f3671dc959f223bff005ed6bef7d0a583fc51 (diff) | |
| download | hdf5-a9d99b0539a1bb858e435e46adca138a8072a79e.zip hdf5-a9d99b0539a1bb858e435e46adca138a8072a79e.tar.gz hdf5-a9d99b0539a1bb858e435e46adca138a8072a79e.tar.bz2 | |
[svn-r25198] Description:
Bring r25197 from trunk to 1.8 branch:
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/H5Dchunk.c')
| -rw-r--r-- | src/H5Dchunk.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c index 43d140e..0a59ca5 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(ret_value) -} +} /* 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 */ |