summaryrefslogtreecommitdiffstats
path: root/tools/test/h5dump
diff options
context:
space:
mode:
authorkmu <kmu@hdfgroup.org>2019-11-26 23:23:58 (GMT)
committerkmu <kmu@hdfgroup.org>2019-11-26 23:23:58 (GMT)
commit2bb0f52edfdd0ce11595ee673a934f306ca5c4fa (patch)
tree9be4fa9e5b48e88f993723daf1b13ebd03219f66 /tools/test/h5dump
parent4c8a2f726a2eb47a937430e28994db8be1b87b00 (diff)
downloadhdf5-2bb0f52edfdd0ce11595ee673a934f306ca5c4fa.zip
hdf5-2bb0f52edfdd0ce11595ee673a934f306ca5c4fa.tar.gz
hdf5-2bb0f52edfdd0ce11595ee673a934f306ca5c4fa.tar.bz2
Revert "fix issues from previous PR comments"
This reverts commit d242a900f420b040e364f6c0976c01593e955db3.
Diffstat (limited to 'tools/test/h5dump')
-rw-r--r--tools/test/h5dump/dynlib_dump.c5
-rw-r--r--tools/test/h5dump/h5dumpgentest.c16
2 files changed, 10 insertions, 11 deletions
diff --git a/tools/test/h5dump/dynlib_dump.c b/tools/test/h5dump/dynlib_dump.c
index 5989b38..4f2d435 100644
--- a/tools/test/h5dump/dynlib_dump.c
+++ b/tools/test/h5dump/dynlib_dump.c
@@ -16,7 +16,6 @@
#include <stdlib.h>
#include <stdio.h>
#include "H5PLextern.h"
-#include "H5private.h"
#define H5Z_FILTER_DYNLIBUD 300
#define MULTIPLIER 3
@@ -70,7 +69,7 @@ H5Z_filter_dynlibud(unsigned int flags, size_t cd_nelmts,
/* Subtract the original value with MULTIPLIER */
while(buf_left > 0) {
char temp = *int_ptr;
- ASSIGN_TO_SMALLER_SIZE(*int_ptr, char, temp - MULTIPLIER, int);
+ *int_ptr = (char)(temp - MULTIPLIER);
int_ptr++;
buf_left -= sizeof(*int_ptr);
} /* end while */
@@ -79,7 +78,7 @@ H5Z_filter_dynlibud(unsigned int flags, size_t cd_nelmts,
/* Add the original value with MULTIPLIER */
while(buf_left > 0) {
char temp = *int_ptr;
- ASSIGN_TO_SMALLER_SIZE(*int_ptr, char, temp + MULTIPLIER, int);
+ *int_ptr = (char)(temp + MULTIPLIER);
int_ptr++;
buf_left -= sizeof(*int_ptr);
} /* end while */
diff --git a/tools/test/h5dump/h5dumpgentest.c b/tools/test/h5dump/h5dumpgentest.c
index 2f8c1a6..85fe754 100644
--- a/tools/test/h5dump/h5dumpgentest.c
+++ b/tools/test/h5dump/h5dumpgentest.c
@@ -2565,7 +2565,7 @@ static void gent_bitfields(void)
goto error;
for(i = 0; i < sizeof buf; i++)
- ASSIGN_TO_SMALLER_SIZE(buf[i], unsigned char, 0xff ^ i, size_t);
+ buf[i] = (unsigned char)(0xff ^ i);
if(H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
goto error;
if(H5Sclose(space) < 0) goto error;
@@ -2579,7 +2579,7 @@ static void gent_bitfields(void)
(dset = H5Dcreate2(grp, "bitfield_2", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
goto error;
for(i = 0; i < sizeof buf; i++)
- ASSIGN_TO_SMALLER_SIZE(buf[i], unsigned char, 0xff ^ i, size_t);
+ buf[i] = (unsigned char)(0xff ^ i);
if(H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
goto error;
if(H5Sclose(space) < 0) goto error;
@@ -9814,7 +9814,7 @@ static void gent_bitnopaquefields(void)
if ((space = H5Screate_simple(1, &nelmts, NULL)) >= 0) {
if ((dset = H5Dcreate2(grp, "bitfield_1", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) >= 0) {
for (i = 0; i < nelmts; i++) {
- ASSIGN_TO_SMALLER_SIZE(buf[i], uint8_t, 0xff ^ i, size_t);
+ buf[i] = (uint8_t)(0xff ^ i);
}
H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf);
H5Dclose(dset);
@@ -9829,7 +9829,7 @@ static void gent_bitnopaquefields(void)
if ((space = H5Screate_simple(1, &nelmts, NULL)) >= 0) {
if ((dset = H5Dcreate2(grp, "bitfield_2", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) >= 0) {
for (i = 0; i < nelmts; i++) {
- ASSIGN_TO_SMALLER_SIZE(buf2[i], uint16_t, 0xffff ^ (i * 16), size_t);
+ buf2[i] = (uint16_t)(0xffff ^ (i * 16));
}
H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf2);
H5Dclose(dset);
@@ -9879,7 +9879,7 @@ static void gent_bitnopaquefields(void)
if ((space = H5Screate_simple(1, &nelmts, NULL)) >= 0) {
if ((dset = H5Dcreate2(grp, "opaque_1", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) >= 0) {
for(i = 0; i < nelmts; i++)
- ASSIGN_TO_SMALLER_SIZE(buf[i], uint8_t, 0xff ^ i, size_t);
+ buf[i] = (uint8_t)(0xff ^ i);
H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf);
H5Dclose(dset);
}
@@ -9895,7 +9895,7 @@ static void gent_bitnopaquefields(void)
if ((space = H5Screate_simple(1, &nelmts, NULL)) >= 0) {
if ((dset = H5Dcreate2(grp, "opaque_2", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) >= 0) {
for(i = 0; i < nelmts; i++)
- ASSIGN_TO_SMALLER_SIZE(buf2[i], uint16_t, 0xffff ^ (i * 16), size_t);
+ buf2[i] = (uint16_t)(0xffff ^ (i * 16));
H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf2);
H5Dclose(dset);
@@ -9918,8 +9918,8 @@ static void gent_bitnopaquefields(void)
if ((space = H5Screate_simple(1, &nelmts, NULL)) >= 0) {
if ((dset = H5Dcreate2(grp, "compound_1", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) >= 0) {
for(i = 0; i < nelmts; i++) {
- ASSIGN_TO_SMALLER_SIZE(buf5[i].a, uint8_t, 0xff ^ i, size_t);
- ASSIGN_TO_SMALLER_SIZE(buf5[i].b, uint16_t, 0xffff ^ (i * 16), size_t);
+ buf5[i].a = (uint8_t)(0xff ^ i);
+ buf5[i].b = (uint16_t)(0xffff ^ (i * 16));
buf5[i].c = (uint32_t)0xffffffff ^ (uint32_t)(i * 32);
buf5[i].d = (uint64_t)0xffffffffffffffff ^ (uint64_t)(i * 64);
}