summaryrefslogtreecommitdiffstats
path: root/hl
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2014-05-17 03:22:51 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2014-05-17 03:22:51 (GMT)
commita613b70f93595fb8eacbe3ac076fe4d66f294d4f (patch)
treef2f4fd54a635c6df6039265f45c8c1bef3e28127 /hl
parent896a5e7992a8419b4214406397093ac1c2bf9eab (diff)
downloadhdf5-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 'hl')
-rw-r--r--hl/test/test_image.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hl/test/test_image.c b/hl/test/test_image.c
index 814b351..5d68eeb 100644
--- a/hl/test/test_image.c
+++ b/hl/test/test_image.c
@@ -771,9 +771,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;