diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2015-09-07 00:22:07 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2015-09-07 00:22:07 (GMT) |
commit | a8df8470bbd6d5abd52f8c53b4d63e8add59adcc (patch) | |
tree | ce51431f4652d02a9465f89df62bcd34e5ec6190 /test/trefer.c | |
parent | ecfcf34b945ec2b2412ac5a991fbdaf6489c655e (diff) | |
download | hdf5-a8df8470bbd6d5abd52f8c53b4d63e8add59adcc.zip hdf5-a8df8470bbd6d5abd52f8c53b4d63e8add59adcc.tar.gz hdf5-a8df8470bbd6d5abd52f8c53b4d63e8add59adcc.tar.bz2 |
[svn-r27689] Merge of r27459 and r27460 from trunk
Minor warning cleanup
(27459) Renamed a few "h5tri_t extended" variables to "h5tri_t was_extended".
Apparently, "extended" is a typedef name someplace in the headers used on
Solaris, which causes potentially confusing warnings to be emitted.
(27460) Minor code cleanup in test/trefer.c
- Fixed an out-of-range char assignment.
- Added a couple of malloc() casts.
Tested on: h5committest
Diffstat (limited to 'test/trefer.c')
-rw-r--r-- | test/trefer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/trefer.c b/test/trefer.c index c99d7ee..93c7dd4 100644 --- a/test/trefer.c +++ b/test/trefer.c @@ -493,7 +493,7 @@ test_reference_region(void) hsize_t high[SPACE2_RANK]; /* Selection bounds */ hdset_reg_ref_t *wbuf, /* buffer to write to disk */ *rbuf; /* buffer read from disk */ - hdset_reg_ref_t nvrbuf[3]={{0},{101},{1000000000}}; /* buffer with non-valid refs */ + hdset_reg_ref_t nvrbuf[3]={{0},{101},{255}}; /* buffer with non-valid refs */ uint8_t *dwbuf, /* Buffer for writing numeric data to disk */ *drbuf; /* Buffer for reading numeric data from disk */ uint8_t *tu8; /* Temporary pointer to uint8 data */ @@ -716,7 +716,7 @@ test_reference_region(void) VERIFY(ret, 36, "H5Sget_select_npoints"); ret = (int)H5Sget_select_hyper_nblocks(sid2); VERIFY(ret, 1, "H5Sget_select_hyper_nblocks"); - coords = HDmalloc(ret * SPACE2_RANK * sizeof(hsize_t) * 2); /* allocate space for the hyperslab blocks */ + coords = (hsize_t *)HDmalloc(ret * SPACE2_RANK * sizeof(hsize_t) * 2); /* allocate space for the hyperslab blocks */ ret = H5Sget_select_hyper_blocklist(sid2, (hsize_t)0, (hsize_t)ret, coords); CHECK(ret, FAIL, "H5Sget_select_hyper_blocklist"); VERIFY(coords[0], 2, "Hyperslab Coordinates"); @@ -744,7 +744,7 @@ test_reference_region(void) VERIFY(ret, 10, "H5Sget_select_npoints"); ret = (int)H5Sget_select_elem_npoints(sid2); VERIFY(ret, 10, "H5Sget_select_elem_npoints"); - coords = HDmalloc(ret * SPACE2_RANK * sizeof(hsize_t)); /* allocate space for the element points */ + coords = (hsize_t *)HDmalloc(ret * SPACE2_RANK * sizeof(hsize_t)); /* allocate space for the element points */ ret = H5Sget_select_elem_pointlist(sid2, (hsize_t)0, (hsize_t)ret, coords); CHECK(ret, FAIL, "H5Sget_select_elem_pointlist"); VERIFY(coords[0], coord1[0][0], "Element Coordinates"); |