diff options
| author | kmu <kmu@hdfgroup.org> | 2019-11-26 23:23:34 (GMT) |
|---|---|---|
| committer | David Young <dyoung@hdfgroup.org> | 2020-05-20 14:20:24 (GMT) |
| commit | f2028c7568c2ad8ef91bc78cc8dac9b2d8c8eb1d (patch) | |
| tree | f63980b1e4a4aed7a0a3cf4c3d7a3f83496c10e1 /test | |
| parent | 9a3a13cacb2c519a5c4deab817606a743e9ece0d (diff) | |
| download | hdf5-f2028c7568c2ad8ef91bc78cc8dac9b2d8c8eb1d.zip hdf5-f2028c7568c2ad8ef91bc78cc8dac9b2d8c8eb1d.tar.gz hdf5-f2028c7568c2ad8ef91bc78cc8dac9b2d8c8eb1d.tar.bz2 | |
Revert "using a different MACRO"
This reverts commit fc61b7a9f3a38331809ebcb6247482943947cdb8.
Diffstat (limited to 'test')
| -rw-r--r-- | test/dsets.c | 6 | ||||
| -rw-r--r-- | test/dtypes.c | 4 | ||||
| -rw-r--r-- | test/ntypes.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/test/dsets.c b/test/dsets.c index 6d90474..9d5b410 100644 --- a/test/dsets.c +++ b/test/dsets.c @@ -5293,7 +5293,7 @@ test_types(hid_t file) (space=H5Screate_simple(1, &nelmts, NULL)) < 0 || (dset=H5Dcreate2(grp, "bitfield_1", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto error; - for(i=0; i<sizeof buf; i++) H5_CHECKED_ASSIGN(buf[i], unsigned char, 0xff ^ i, size_t); + for(i=0; i<sizeof buf; i++) ASSIGN_TO_SMALLER_SIZE(buf[i], unsigned char, 0xff ^ i, size_t); if(H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) goto error; @@ -5307,7 +5307,7 @@ test_types(hid_t file) (space=H5Screate_simple(1, &nelmts, NULL)) < 0 || (dset=H5Dcreate2(grp, "bitfield_2", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto error; - for(i=0; i<sizeof buf; i++) H5_CHECKED_ASSIGN(buf[i], unsigned char, 0xff ^ i, size_t); + for(i=0; i<sizeof buf; i++) ASSIGN_TO_SMALLER_SIZE(buf[i], unsigned char, 0xff ^ i, size_t); if(H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) goto error; if(H5Sclose(space) < 0) goto error; @@ -5322,7 +5322,7 @@ test_types(hid_t file) (dset = H5Dcreate2(grp, "opaque_1", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto error; for(i = 0; i < sizeof buf; i++) - H5_CHECKED_ASSIGN(buf[i], unsigned char, 0xff ^ i, size_t); + ASSIGN_TO_SMALLER_SIZE(buf[i], unsigned char, 0xff ^ i, size_t); if(H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) goto error; if(H5Sclose(space) < 0) goto error; if(H5Tclose(type) < 0) goto error; diff --git a/test/dtypes.c b/test/dtypes.c index 950086f..33ebe3d 100644 --- a/test/dtypes.c +++ b/test/dtypes.c @@ -1216,8 +1216,8 @@ test_compound_6(void) orig = (unsigned char*)HDmalloc(nelmts * sizeof(struct st)); for (i=0; i<(int)nelmts; i++) { s_ptr = ((struct st*)((void *)orig)) + i; - H5_CHECKED_ASSIGN(s_ptr->b, short, (i*8+1) & 0x7fff, int); - H5_CHECKED_ASSIGN(s_ptr->d, short, (i*8+6) & 0x7fff, int); + ASSIGN_TO_SMALLER_SIZE(s_ptr->b, short, (i*8+1) & 0x7fff, int); + ASSIGN_TO_SMALLER_SIZE(s_ptr->d, short, (i*8+6) & 0x7fff, int); } HDmemcpy(buf, orig, nelmts*sizeof(struct st)); diff --git a/test/ntypes.c b/test/ntypes.c index 99bc155..03eefe6 100644 --- a/test/ntypes.c +++ b/test/ntypes.c @@ -2484,7 +2484,7 @@ test_opaque_dtype(hid_t file) TEST_ERROR; for(i = 0; i < sizeof(wbuf); i++) - H5_CHECKED_ASSIGN(wbuf[i], unsigned char, 0xff ^ i, size_t); + ASSIGN_TO_SMALLER_SIZE(wbuf[i], unsigned char, 0xff ^ i, size_t); if(H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, wbuf) < 0) TEST_ERROR; if(H5Sclose(space) < 0) TEST_ERROR; |