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 /hl/test | |
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 'hl/test')
-rw-r--r-- | hl/test/test_image.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/hl/test/test_image.c b/hl/test/test_image.c index d2d9cab..3109a36 100644 --- a/hl/test/test_image.c +++ b/hl/test/test_image.c @@ -544,7 +544,7 @@ static int test_generate(void) int imax, jmax, kmax; int n_elements; float valex, xmin, xmax, value; - FILE *f; + FILE *f = NULL; char *srcdir = getenv("srcdir"); /* the source directory */ char data_file[512]=""; /* buffer to hold name of existing data file */ int i; @@ -648,7 +648,8 @@ static int test_generate(void) fscanf( f, "%f ", &value ); data[i] = value; } - HDfclose( f ); + HDfclose(f); + f = NULL; /*------------------------------------------------------------------------- * transform the data from floating point to unsigned char @@ -758,6 +759,8 @@ out: H5E_BEGIN_TRY { H5Fclose(fid); } H5E_END_TRY; + if(f) + HDfclose(f); H5_FAILED(); return retval; } |