diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2014-03-25 15:58:48 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2014-03-25 15:58:48 (GMT) |
| commit | a7d3f5b5b1591c6cbf77b07383fc6de51e11d0b1 (patch) | |
| tree | ea5b56bde574d082b6f82dd36d307aa7426eb639 /src/H5Zshuffle.c | |
| parent | 708e8077c2c1bc5c1a28d8804e6a0ee670fe4600 (diff) | |
| download | hdf5-a7d3f5b5b1591c6cbf77b07383fc6de51e11d0b1.zip hdf5-a7d3f5b5b1591c6cbf77b07383fc6de51e11d0b1.tar.gz hdf5-a7d3f5b5b1591c6cbf77b07383fc6de51e11d0b1.tar.bz2 | |
[svn-r24894] Description:
Bring r24869 & r24875 from trunk to 1.8 branch:
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
(daily tested on trunk)
Diffstat (limited to 'src/H5Zshuffle.c')
| -rw-r--r-- | src/H5Zshuffle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/H5Zshuffle.c b/src/H5Zshuffle.c index 90509b0..4a67839 100644 --- a/src/H5Zshuffle.c +++ b/src/H5Zshuffle.c @@ -81,7 +81,7 @@ H5Z_set_local_shuffle(hid_t dcpl_id, hid_t type_id, hid_t UNUSED space_id) HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID") /* Get datatype */ - if(NULL == (type = H5I_object_verify(type_id, H5I_DATATYPE))) + if(NULL == (type = (const H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype") /* Get the filter's current parameters */ |