From dd6c8994c01cd31b5230e98838f11e4c229fdb34 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Sun, 5 Jun 2016 19:45:37 -0500 Subject: [svn-r30017] Description: Bring warning cleanusp in r29990, 29993, 29997, 29999, 30004 from revise_chunks branch to trunk. Tested on: MacOSX/64 10.11.5 (amazon) w/serial, parallel & production. (h5committest forthcoming) --- src/H5HG.c | 2 +- src/H5HP.c | 3 +- src/H5MFaggr.c | 2 +- src/H5SL.c | 16 ++- src/H5Tbit.c | 67 +++++------ src/H5Tconv.c | 8 +- src/H5Tpkg.h | 4 +- src/H5private.h | 16 +-- test/cross_read.c | 324 +++++++++++++++++++++++++++----------------------- test/gen_cross.c | 4 +- test/gen_deflate.c | 112 +++++++++-------- test/gen_file_image.c | 71 ++++++----- test/h5test.c | 2 +- test/istore.c | 6 +- test/pool.c | 2 +- test/tattr.c | 40 +++---- test/tconfig.c | 4 +- 17 files changed, 363 insertions(+), 320 deletions(-) diff --git a/src/H5HG.c b/src/H5HG.c index f95b607..c33b85f 100644 --- a/src/H5HG.c +++ b/src/H5HG.c @@ -183,7 +183,7 @@ H5HG_create(H5F_t *f, hid_t dxpl_id, size_t size) * which was always at least H5HG_ALIGNMENT aligned then we could just * align the pointer, but this might not be the case. */ - n = H5HG_ALIGN(p - heap->chunk) - (size_t)(p - heap->chunk); + n = (size_t)H5HG_ALIGN(p - heap->chunk) - (size_t)(p - heap->chunk); #ifdef OLD_WAY /* Don't bother zeroing out the rest of the info in the heap -QAK */ HDmemset(p, 0, n); diff --git a/src/H5HP.c b/src/H5HP.c index f6fb20c..78e9e5b 100644 --- a/src/H5HP.c +++ b/src/H5HP.c @@ -848,7 +848,8 @@ H5HP_decr(H5HP_t *heap, unsigned amt, void *_obj) HDassert(obj_loc>0 && obj_loc<=heap->nobjs); /* Change the heap object's priority */ - heap->heap[obj_loc].val-=amt; + H5_CHECK_OVERFLOW(amt, unsigned, int); + heap->heap[obj_loc].val-=(int)amt; /* Restore heap condition */ if(heap->type==H5HP_MAX_HEAP) { diff --git a/src/H5MFaggr.c b/src/H5MFaggr.c index 40f3ac0..f2c5936 100644 --- a/src/H5MFaggr.c +++ b/src/H5MFaggr.c @@ -414,7 +414,7 @@ H5MF_aggr_try_extend(H5F_t *f, H5F_blk_aggr_t *aggr, H5FD_mem_t type, /* If the aggregator is at the end of file: */ if(H5F_addr_eq(eoa, aggr->addr + aggr->size)) { /* If extra_requested is below percentage threshold, extend block into the aggregator. */ - if(extra_requested <= (EXTEND_THRESHOLD * aggr->size)) { + if(extra_requested <= (hsize_t)(EXTEND_THRESHOLD * (float)aggr->size)) { aggr->size -= extra_requested; aggr->addr += extra_requested; diff --git a/src/H5SL.c b/src/H5SL.c index 1cd64ec..f9d7654 100644 --- a/src/H5SL.c +++ b/src/H5SL.c @@ -1286,12 +1286,12 @@ done: void * H5SL_remove_first(H5SL_t *slist) { - void *ret_value = NULL; /* Return value */ - H5SL_node_t *head = slist->header; /* Skip list header */ - H5SL_node_t *tmp = slist->header->forward[0]; /* Temporary node pointer */ - H5SL_node_t *next; /* Next node to search for */ - size_t level = slist->curr_level; /* Skip list level */ - size_t i; /* Index */ + void *ret_value = NULL; /* Return value */ + H5SL_node_t *head = slist->header; /* Skip list header */ + H5SL_node_t *tmp = slist->header->forward[0]; /* Temporary node pointer */ + H5SL_node_t *next; /* Next node to search for */ + size_t level; /* Skip list level */ + size_t i; /* Index */ FUNC_ENTER_NOAPI_NOINIT @@ -1301,6 +1301,10 @@ H5SL_remove_first(H5SL_t *slist) /* Not currently supported */ HDassert(!slist->safe_iterating); + /* Assign level */ + H5_CHECK_OVERFLOW(slist->curr_level, int, size_t); + level = (size_t)slist->curr_level; + /* Check internal consistency */ /* (Pre-condition) */ diff --git a/src/H5Tbit.c b/src/H5Tbit.c index 8c53066..a6b917f 100644 --- a/src/H5Tbit.c +++ b/src/H5Tbit.c @@ -514,22 +514,19 @@ done: /*------------------------------------------------------------------------- - * Function: H5T__bit_inc + * Function: H5T__bit_inc * - * Purpose: Increment part of a bit field by adding 1. The bit field + * Purpose: Increment part of a bit field by adding 1. The bit field * starts with bit position START and is SIZE bits long. * - * Return: Success: The carry-out value. One if overflows, - * zero otherwise. - * - * Failure: Negative + * Return: The carry-out value. TRUE if overflows, FALSE otherwise. * * Programmer: Robb Matzke * Friday, June 26, 1998 * *------------------------------------------------------------------------- */ -htri_t +hbool_t H5T__bit_inc(uint8_t *buf, size_t start, size_t size) { size_t idx = start / 8; @@ -545,38 +542,38 @@ H5T__bit_inc(uint8_t *buf, size_t start, size_t size) /* The first partial byte */ if(start) { - if(size + start < 8) + if(size + start < 8) mask = ((unsigned)1 << size) - 1; - else + else mask = ((unsigned)1 << (8 - start)) - 1; - acc = ((unsigned)buf[idx] >> start) & mask; - acc++; - carry = acc & ((unsigned)1 << MIN(size, 8 - start)); - buf[idx] &= (uint8_t)(~(mask << start)); - buf[idx] = (uint8_t)(buf[idx] | ((acc & mask) << start)); - size -= MIN(size, 8 - start); - start = 0; - idx++; + acc = ((unsigned)buf[idx] >> start) & mask; + acc++; + carry = acc & ((unsigned)1 << MIN(size, 8 - start)); + buf[idx] &= (uint8_t)(~(mask << start)); + buf[idx] = (uint8_t)(buf[idx] | ((acc & mask) << start)); + size -= MIN(size, 8 - start); + start = 0; + idx++; } /* end if */ /* The middle */ while(carry && size >= 8) { - acc = buf[idx]; - acc++; - carry = acc & 0x100; - buf[idx] = acc & 0xff; - idx++; - size -= 8; + acc = buf[idx]; + acc++; + carry = acc & 0x100; + buf[idx] = acc & 0xff; + idx++; + size -= 8; } /* end while */ /* The last bits */ if(carry && size > 0) { - mask = ((unsigned)1 << size) - 1; - acc = buf[idx] & mask; - acc++; - carry = acc & ((unsigned)1 << size); - buf[idx] &= (uint8_t)(~mask); - buf[idx] |= (uint8_t)(acc & mask); + mask = ((unsigned)1 << size) - 1; + acc = buf[idx] & mask; + acc++; + carry = acc & ((unsigned)1 << size); + buf[idx] &= (uint8_t)(~mask); + buf[idx] |= (uint8_t)(acc & mask); } /* end if */ FUNC_LEAVE_NOAPI(carry ? TRUE : FALSE) @@ -586,20 +583,18 @@ H5T__bit_inc(uint8_t *buf, size_t start, size_t size) /*------------------------------------------------------------------------- * Function: H5T__bit_dec * - * Purpose: decrement part of a bit field by substracting 1. The bit + * Purpose: Decrement part of a bit field by substracting 1. The bit * field starts with bit position START and is SIZE bits long. * - * Return: Success: The "borrow-in" value. It's one if underflows, - * zero otherwise. + * Return: The "borrow-in" value. It's TRUE if underflows, FALSE + * otherwise. * - * Failure: Negative - * - * Programmer: Raymond Lu + * Programmer: Raymond Lu * March 17, 2004 * *------------------------------------------------------------------------- */ -htri_t +hbool_t H5T__bit_dec(uint8_t *buf, size_t start, size_t size) { size_t idx = start / 8; diff --git a/src/H5Tconv.c b/src/H5Tconv.c index 8b96d22..23ccd98 100644 --- a/src/H5Tconv.c +++ b/src/H5Tconv.c @@ -4032,7 +4032,7 @@ H5T__conv_f_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t mpos; /*offset to useful mant is src */ uint64_t sign; /*source sign bit value */ size_t mrsh; /*amount to right shift mantissa*/ - hbool_t carry = 0; /*carry after rounding mantissa */ + hbool_t carry = FALSE; /*carry after rounding mantissa */ size_t i; /*miscellaneous counters */ size_t implied; /*destination implied bits */ hbool_t denormalized = FALSE; /*is either source or destination denormalized?*/ @@ -4408,7 +4408,7 @@ H5T__conv_f_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, /* Don't do rounding if exponent is 111...110 and mantissa is 111...11. * To do rounding and increment exponent in this case will create an infinity value.*/ if((H5T__bit_find(s, mpos + (size_t)bitno, msize - (size_t)bitno, H5T_BIT_LSB, FALSE) >= 0 || expo < expo_max - 1)) { - carry = (hbool_t)H5T__bit_inc(s, mpos + (size_t)bitno - 1, 1 + msize - (size_t)bitno); + carry = H5T__bit_inc(s, mpos + (size_t)bitno - 1, 1 + msize - (size_t)bitno); if(carry) implied = 2; } @@ -4417,7 +4417,7 @@ H5T__conv_f_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, H5T__bit_inc(s, mpos + (size_t)bitno - 1, 1 + msize - (size_t)bitno); } else - carry=0; + carry = FALSE; /* * Write the mantissa to the destination @@ -4480,7 +4480,7 @@ H5T__conv_f_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, } } /*reset CARRY*/ - carry = 0; + carry = FALSE; H5_CHECK_OVERFLOW(expo,hssize_t,hsize_t); H5T__bit_set_d(d, dst.u.f.epos, dst.u.f.esize, (hsize_t)expo); diff --git a/src/H5Tpkg.h b/src/H5Tpkg.h index 0bd1e06..49b0ea0 100644 --- a/src/H5Tpkg.h +++ b/src/H5Tpkg.h @@ -1288,8 +1288,8 @@ H5_DLL void H5T__bit_set_d(uint8_t *buf, size_t offset, size_t size, uint64_t val); H5_DLL ssize_t H5T__bit_find(uint8_t *buf, size_t offset, size_t size, H5T_sdir_t direction, hbool_t value); -H5_DLL htri_t H5T__bit_inc(uint8_t *buf, size_t start, size_t size); -H5_DLL htri_t H5T__bit_dec(uint8_t *buf, size_t start, size_t size); +H5_DLL hbool_t H5T__bit_inc(uint8_t *buf, size_t start, size_t size); +H5_DLL hbool_t H5T__bit_dec(uint8_t *buf, size_t start, size_t size); H5_DLL void H5T__bit_neg(uint8_t *buf, size_t start, size_t size); /* VL functions */ diff --git a/src/H5private.h b/src/H5private.h index e0ed6ef..d400469 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -1515,7 +1515,7 @@ extern char *strdup(const char *s); #define H5_CHECK_OVERFLOW(var, vartype, casttype) \ { \ casttype _tmp_overflow = (casttype)(var); \ - assert((var) == (vartype)_tmp_overflow); \ + HDassert((var) == (vartype)_tmp_overflow); \ } #else /* NDEBUG */ #define H5_CHECK_OVERFLOW(var, vartype, casttype) @@ -1529,7 +1529,7 @@ extern char *strdup(const char *s); { \ srctype _tmp_src = (srctype)(src); \ dsttype _tmp_dst = (dsttype)(_tmp_src); \ - assert(_tmp_src == (srctype)_tmp_dst); \ + HDassert(_tmp_src == (srctype)_tmp_dst); \ (dst) = _tmp_dst; \ } @@ -1540,8 +1540,8 @@ extern char *strdup(const char *s); { \ srctype _tmp_src = (srctype)(src); \ dsttype _tmp_dst = (dsttype)(_tmp_src); \ - assert(_tmp_src >= 0); \ - assert(_tmp_src == _tmp_dst); \ + HDassert(_tmp_src >= 0); \ + HDassert(_tmp_src == _tmp_dst); \ (dst) = _tmp_dst; \ } @@ -1552,8 +1552,8 @@ extern char *strdup(const char *s); { \ srctype _tmp_src = (srctype)(src); \ dsttype _tmp_dst = (dsttype)(_tmp_src); \ - assert(_tmp_dst >= 0); \ - assert(_tmp_src == (srctype)_tmp_dst); \ + HDassert(_tmp_dst >= 0); \ + HDassert(_tmp_src == (srctype)_tmp_dst); \ (dst) = _tmp_dst; \ } @@ -1561,8 +1561,8 @@ extern char *strdup(const char *s); { \ srctype _tmp_src = (srctype)(src); \ dsttype _tmp_dst = (dsttype)(_tmp_src); \ - assert(_tmp_src >= 0); \ - assert(_tmp_src == (srctype)_tmp_dst); \ + HDassert(_tmp_src >= 0); \ + HDassert(_tmp_src == (srctype)_tmp_dst); \ (dst) = _tmp_dst; \ } diff --git a/test/cross_read.c b/test/cross_read.c index b2fae89..8df81f0 100644 --- a/test/cross_read.c +++ b/test/cross_read.c @@ -64,9 +64,9 @@ const char *FILENAME[] = { /*------------------------------------------------------------------------- - * Function: open_dataset + * Function: check_data_i * - * Purpose: Read and compare the data from a dataset. + * Purpose: Read and compare the integer data from a dataset. * * Return: Success: 0 * Failure: 1 @@ -74,112 +74,143 @@ const char *FILENAME[] = { * Programmer: Raymond Lu * 17 May 2011 * - * Modifications: - * *------------------------------------------------------------------------- */ -static int check_data(const char *dsetname, hid_t fid, hbool_t floating_number) +static int +check_data_i(const char *dsetname, hid_t fid) { - hid_t dataset; /* handles */ - double data_in[NX+1][NY]; /* input buffer */ - double data_out[NX+1][NY]; /* output buffer */ - long long int_data_in[NX+1][NY]; /* input buffer */ - long long int_data_out[NX+1][NY]; /* output buffer */ - int i, j; - unsigned nerrors = 0; - - /* - * Open the regular dataset. + hid_t did = -1; /* dataset ID */ + long long data_in[NX+1][NY]; /* input buffer */ + long long data_out[NX+1][NY]; /* output buffer */ + int i, j; /* iterators */ + int nerrors = 0; /* # errors in dataset values */ + + /* Open the dataset. */ + if((did = H5Dopen2(fid, dsetname, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; + + /* Initialization. */ + /* Input (last row is different) */ + for(i = 0; i < NX; i++) + for(j = 0; j < NY; j++) + data_in[i][j] = i + j; + for(i = 0; i < NY; i++) + data_in[NX][i] = -2; + /* Output */ + HDmemset(data_out, 0, (NX+1) * NY * sizeof(long long)); + + /* Read data from hyperslab in the file into the hyperslab in + * memory and display. */ - if((dataset = H5Dopen2(fid, dsetname, H5P_DEFAULT)) < 0) - TEST_ERROR; + if(H5Dread(did, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, data_out) < 0) + FAIL_STACK_ERROR; + + /* Check results */ + for(i = 0; i < (NX + 1); i++) + for(j = 0; j < NY; j++) + if(data_out[i][j] != data_in[i][j]) + if(!nerrors++) { + H5_FAILED(); + printf("element [%d][%d] is %lld but should have been %lld\n", + (int)i, (int)j, data_out[i][j], data_in[i][j]); + } /* end if */ + + /* Close/release resources. */ + if(H5Dclose(did) < 0) + FAIL_STACK_ERROR - /* - * Data and output buffer initialization. - */ - for (j = 0; j < NX; j++) { - for (i = 0; i < NY; i++) { - data_in[j][i] = ((double)(i + j + 1))/3; - data_out[j][i] = 0.0F; - - int_data_in[j][i] = i + j; - int_data_out[j][i] = 0; - } - } - for (i = 0; i < NY; i++) { - data_in[NX][i] = -2.2F; - data_out[NX][i] = 0.0F; + /* Failure */ + if(nerrors) { + printf("total of %d errors out of %d elements\n", nerrors, (int)(NX*NY)); + return 1; + } /* end if */ + + PASSED(); + return 0; - int_data_in[NX][i] = -2; - int_data_out[NX][i] = 0; - } +error: + H5E_BEGIN_TRY { + H5Dclose(did); + } H5E_END_TRY; + return 1; +} /* end check_data_i() */ - /* - * Read data from hyperslab in the file into the hyperslab in + +/*------------------------------------------------------------------------- + * Function: check_data_f + * + * Purpose: Read and compare the floating-point data from a dataset. + * + * Return: Success: 0 + * Failure: 1 + * + * Programmer: Raymond Lu + * 17 May 2011 + * + *------------------------------------------------------------------------- + */ +static int +check_data_f(const char *dsetname, hid_t fid) +{ + hid_t did = -1; /* dataset ID */ + double data_in[NX+1][NY]; /* input buffer */ + double data_out[NX+1][NY]; /* output buffer */ + int i, j; /* iterators */ + int nerrors = 0; /* # of errors in dataset values */ + + /* Open the dataset. */ + if((did = H5Dopen2(fid, dsetname, H5P_DEFAULT)) < 0) + FAIL_STACK_ERROR; + + /* Initialization. */ + /* Input (last row is different) */ + for(i = 0; i < NX; i++) + for(j = 0; j < NY; j++) + data_in[i][j] = ((double)(i + j + 1)) / (double)3.0F; + for(i = 0; i < NY; i++) + data_in[NX][i] = -2.2F; + /* Output */ + HDmemset(data_out, 0, (NX+1) * NY * sizeof(double)); + + /* Read data from hyperslab in the file into the hyperslab in * memory and display. */ - if(floating_number) { - if(H5Dread(dataset, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT, - data_out) < 0) - TEST_ERROR; - - /* Check results */ - for (j=0; j<(NX+1); j++) { - for (i=0; i + * Programmer: Quincey Koziol * Thursday, November 14, 2002 * - * Purpose: Create a dataset compressed with the deflate filter. - * This program is used to create the test file `tdeflate.h5' which has - * a dataset compressed with the "deflate" I/O filter. This dataset will - * be used to verify the correct behavior of the library when a filter is - * not available for a dataset which requires it. + * Purpose: Create a dataset compressed with the deflate filter. + * This program is used to create the test file `tdeflate.h5' + * which has a dataset compressed with the "deflate" I/O filter. + * This dataset will be used to verify the correct behavior of + * the library when a filter is not available for a dataset which + * requires it. */ -#include "hdf5.h" + +#include "h5test.h" #define TESTFILE "deflate.h5" @@ -34,80 +36,86 @@ #define CHUNK_DIM1 50 #define CHUNK_DIM2 50 -/* Dataset data */ -int data[SPACE_DIM1][SPACE_DIM2]; /*------------------------------------------------------------------------- * Function: main * - * Purpose: - * - * Return: Success: - * - * Failure: + * Return: EXIT_SUCCESS/EXIT_FAILURE * * Programmer: Quincey Koziol * Thursday, November 14, 2002 * - * Modifications: - * *------------------------------------------------------------------------- */ int main(void) { - hid_t file, space, dset, dcpl; - hsize_t dims[SPACE_RANK]={SPACE_DIM1,SPACE_DIM2}; - hsize_t chunk_dims[SPACE_RANK]={CHUNK_DIM1,CHUNK_DIM2}; - size_t i,j; /* Local index variables */ + hid_t fid = -1, sid = -1, did = -1, dcpl_id = -1; + hsize_t dims[SPACE_RANK] = {SPACE_DIM1, SPACE_DIM2}; + hsize_t chunk_dims[SPACE_RANK] = {CHUNK_DIM1, CHUNK_DIM2}; + size_t i,j; /* Local index variables */ + int *data = NULL; /* Dataset data */ /* Initialize the data */ /* (Try for something easily compressible) */ - for(i=0; i + * 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" @@ -29,18 +29,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 @@ -50,42 +43,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() */ diff --git a/test/h5test.c b/test/h5test.c index 8181ff9..39731a2 100644 --- a/test/h5test.c +++ b/test/h5test.c @@ -836,7 +836,7 @@ h5_fileaccess(void) /* In-memory driver with write tracking and paging on */ if (H5Pset_fapl_core(fapl, (size_t)1, TRUE)<0) return -1; if (H5Pset_core_write_tracking(fapl, TRUE, (size_t)4096)<0) return -1; - } else if (!HDstrcmp(name, "split")) { + } else if (!HDstrcmp(name, "split")) { /* Split meta data and raw data each using default driver */ if (H5Pset_fapl_split(fapl, "-m.h5", H5P_DEFAULT, diff --git a/test/istore.c b/test/istore.c index ec7542a..68668d8 100644 --- a/test/istore.c +++ b/test/istore.c @@ -529,9 +529,9 @@ test_sparse(hid_t f, const char *prefix, size_t nblocks, if((mspace=H5Screate_simple(ndims,size,NULL)) < 0) TEST_ERROR; for (ctr=0; ctr