summaryrefslogtreecommitdiffstats
path: root/hl
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2012-08-12 02:20:43 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2012-08-12 02:20:43 (GMT)
commitcd5ad177a23698c1daf6fb8c4195336865d795d2 (patch)
tree13720372b8dcf964d99cbec2d7ff5de1bdbdd565 /hl
parentcd3f42096b9a957e37c9df48aa0d31d9ed4bc537 (diff)
downloadhdf5-cd5ad177a23698c1daf6fb8c4195336865d795d2.zip
hdf5-cd5ad177a23698c1daf6fb8c4195336865d795d2.tar.gz
hdf5-cd5ad177a23698c1daf6fb8c4195336865d795d2.tar.bz2
[svn-r22669] Description:
Merge r22634:2266 from trunk to revise_chunks branch Tested on: Mac OSX/64 10.7.4 (amazon) w/debug, gcc-4.7.x, C++, FORTRAN and threadsafe (h5committest not needed on this branch)
Diffstat (limited to 'hl')
-rw-r--r--hl/test/test_image.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/hl/test/test_image.c b/hl/test/test_image.c
index 3914a9f..4cef1b4 100644
--- a/hl/test/test_image.c
+++ b/hl/test/test_image.c
@@ -513,6 +513,7 @@ static int test_generate(void)
FILE *f;
const char *data_file = H5_get_srcdir_filename(DATA_FILE4);
int i;
+ int retval = FAIL;
/* create a file using default properties */
if ((fid=H5Fcreate(FILE3,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT))<0)
@@ -674,15 +675,17 @@ static int test_generate(void)
if (H5Fclose(fid)<0)
goto out;
- return 0;
+ /* Indicate success */
+ retval = 0;
/* error zone, gracefully close */
out:
+ HDfree(data);
H5E_BEGIN_TRY {
H5Fclose(fid);
} H5E_END_TRY;
H5_FAILED();
- return FAIL;
+ return retval;
}