diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2019-07-31 20:18:58 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2019-07-31 20:18:58 (GMT) |
commit | c8d32112f87e0c79999e33cc40cb411da1642b5c (patch) | |
tree | ac3d1dfffa72156bac18aefbf3b76a255ea06478 /test/gen_file_image.c | |
parent | c1a6ba6b648fe4c42dca2ada0f0e8e2c904e3f9e (diff) | |
download | hdf5-c8d32112f87e0c79999e33cc40cb411da1642b5c.zip hdf5-c8d32112f87e0c79999e33cc40cb411da1642b5c.tar.gz hdf5-c8d32112f87e0c79999e33cc40cb411da1642b5c.tar.bz2 |
HDFFV-10845 More changes from 1.10 branch
Diffstat (limited to 'test/gen_file_image.c')
-rw-r--r-- | test/gen_file_image.c | 71 |
1 files changed, 38 insertions, 33 deletions
diff --git a/test/gen_file_image.c b/test/gen_file_image.c index 97342a4..9607cc2 100644 --- a/test/gen_file_image.c +++ b/test/gen_file_image.c @@ -12,13 +12,13 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Programmer: Quincey Koziol <koziol@ncsa.uiuc.edu> + * Programmer: Quincey Koziol * Friday, March 30, 2012 * - * Purpose: Create a simple file for use with the file image tests. + * Purpose: Create a simple file for use with the file image tests. * */ -#include "hdf5.h" +#include "h5test.h" #define TESTFILE "file_image_core_test.h5" @@ -27,18 +27,11 @@ #define SPACE_DIM1 128 #define SPACE_DIM2 32 -/* Dataset data */ -int data[SPACE_DIM1][SPACE_DIM2]; - /*------------------------------------------------------------------------- * Function: main * - * Purpose: - * - * Return: Success: - * - * Failure: + * Return: EXIT_SUCCESS/EXIT_FAILURE * * Programmer: Quincey Koziol * Friday, March 30, 2012 @@ -48,42 +41,54 @@ int data[SPACE_DIM1][SPACE_DIM2]; int main(void) { - hid_t file, space, dset; + hid_t fid = -1, sid = -1, did = -1; hsize_t dims[SPACE_RANK] = {SPACE_DIM1, SPACE_DIM2}; - size_t i, j; /* Local index variables */ + size_t i,j; /* Local index variables */ + int *data = NULL; /* Dataset data */ /* Initialize the data */ + if(NULL == (data = (int *)HDmalloc(SPACE_DIM1 * SPACE_DIM2 * sizeof(int)))) + TEST_ERROR + for(i = 0; i < SPACE_DIM1; i++) for(j = 0; j < SPACE_DIM2; j++) - data[i][j] = (int)(j % 5); + data[(i * SPACE_DIM2) + j] = (int)(j % 5); /* Create the file */ - file = H5Fcreate(TESTFILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); - if(file < 0) - printf("file < 0!\n"); + if((fid = H5Fcreate(TESTFILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Create the dataspace */ - space = H5Screate_simple(SPACE_RANK, dims, NULL); - if(space < 0) - printf("space < 0!\n"); + if((sid = H5Screate_simple(SPACE_RANK, dims, NULL)) < 0) + FAIL_STACK_ERROR /* Create the compressed dataset */ - dset = H5Dcreate2(file, "Dataset1", H5T_NATIVE_INT, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); - if(dset < 0) - printf("dset < 0!\n"); + if((did = H5Dcreate2(fid, "Dataset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR /* Write the data to the dataset */ - if(H5Dwrite(dset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) - printf("H5Dwrite() failed!\n"); + if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) + FAIL_STACK_ERROR /* Close everything */ - if(H5Dclose(dset) < 0) - printf("H5Dclose() failed!\n"); - if(H5Sclose(space) < 0) - printf("H5Sclose() failed!\n"); - if(H5Fclose(file) < 0) - printf("H5Fclose() failed!\n"); + if(H5Dclose(did) < 0) + FAIL_STACK_ERROR + if(H5Sclose(sid) < 0) + FAIL_STACK_ERROR + if(H5Fclose(fid) < 0) + FAIL_STACK_ERROR + + return EXIT_SUCCESS; + +error: + if(data) + HDfree(data); + H5E_BEGIN_TRY { + H5Dclose(did); + H5Sclose(sid); + H5Fclose(fid); + } H5E_END_TRY; - return 0; -} + return EXIT_FAILURE; +} /* end main() */ |