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 /hl | |
| 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 'hl')
| -rw-r--r-- | hl/test/test_image.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hl/test/test_image.c b/hl/test/test_image.c index 3109a36..5740d4b 100644 --- a/hl/test/test_image.c +++ b/hl/test/test_image.c @@ -783,9 +783,9 @@ out: *------------------------------------------------------------------------- */ -static int read_data( const char* fname, /*IN*/ +static int read_data(const char* fname, /*IN*/ hsize_t *width, /*OUT*/ - hsize_t *height /*OUT*/ ) + hsize_t *height /*OUT*/) { int i, n; int color_planes; |