summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/.distdep467
-rw-r--r--test/big.c2
-rw-r--r--test/cmpd_dset.c2
-rw-r--r--test/dsets.c14
-rw-r--r--test/dtypes.c214
-rw-r--r--test/enum.c24
-rw-r--r--test/mtime.c4
-rw-r--r--test/ohdr.c10
8 files changed, 387 insertions, 350 deletions
diff --git a/test/.distdep b/test/.distdep
index 7ca5bce..7e65416 100644
--- a/test/.distdep
+++ b/test/.distdep
@@ -28,9 +28,10 @@ h5test.o: \
../src/H5Tpkg.h \
../src/H5HGprivate.h \
../src/H5Fprivate.h \
- ../src/H5Rprivate.h
-big.o: \
- big.c \
+ ../src/H5Rprivate.h \
+ ../src/H5Tprivate.h
+bittests.o: \
+ bittests.c \
h5test.h \
../src/hdf5.h \
../src/H5public.h \
@@ -59,10 +60,10 @@ big.o: \
../src/H5Tpkg.h \
../src/H5HGprivate.h \
../src/H5Fprivate.h \
- ../src/H5Rprivate.h
-bittests.o: \
- bittests.c \
- h5test.h \
+ ../src/H5Rprivate.h \
+ ../src/H5Tprivate.h
+chunk.o: \
+ chunk.c \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
@@ -85,14 +86,10 @@ bittests.o: \
../src/H5Rpublic.h \
../src/H5RApublic.h \
../src/H5Spublic.h \
- ../src/H5Tpublic.h \
- ../src/H5private.h \
- ../src/H5Tpkg.h \
- ../src/H5HGprivate.h \
- ../src/H5Fprivate.h \
- ../src/H5Rprivate.h
-chunk.o: \
- chunk.c \
+ ../src/H5Tpublic.h
+extend.o: \
+ extend.c \
+ h5test.h \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
@@ -115,9 +112,15 @@ chunk.o: \
../src/H5Rpublic.h \
../src/H5RApublic.h \
../src/H5Spublic.h \
- ../src/H5Tpublic.h
-cmpd_dset.o: \
- cmpd_dset.c \
+ ../src/H5Tpublic.h \
+ ../src/H5private.h \
+ ../src/H5Tpkg.h \
+ ../src/H5HGprivate.h \
+ ../src/H5Fprivate.h \
+ ../src/H5Rprivate.h \
+ ../src/H5Tprivate.h
+fillval.o: \
+ fillval.c \
h5test.h \
../src/hdf5.h \
../src/H5public.h \
@@ -146,9 +149,10 @@ cmpd_dset.o: \
../src/H5Tpkg.h \
../src/H5HGprivate.h \
../src/H5Fprivate.h \
- ../src/H5Rprivate.h
-dsets.o: \
- dsets.c \
+ ../src/H5Rprivate.h \
+ ../src/H5Tprivate.h
+flush1.o: \
+ flush1.c \
h5test.h \
../src/hdf5.h \
../src/H5public.h \
@@ -177,9 +181,10 @@ dsets.o: \
../src/H5Tpkg.h \
../src/H5HGprivate.h \
../src/H5Fprivate.h \
- ../src/H5Rprivate.h
-dtypes.o: \
- dtypes.c \
+ ../src/H5Rprivate.h \
+ ../src/H5Tprivate.h
+flush2.o: \
+ flush2.c \
h5test.h \
../src/hdf5.h \
../src/H5public.h \
@@ -208,9 +213,10 @@ dtypes.o: \
../src/H5Tpkg.h \
../src/H5HGprivate.h \
../src/H5Fprivate.h \
- ../src/H5Rprivate.h
-extend.o: \
- extend.c \
+ ../src/H5Rprivate.h \
+ ../src/H5Tprivate.h
+gheap.o: \
+ gheap.c \
h5test.h \
../src/hdf5.h \
../src/H5public.h \
@@ -239,10 +245,19 @@ extend.o: \
../src/H5Tpkg.h \
../src/H5HGprivate.h \
../src/H5Fprivate.h \
- ../src/H5Rprivate.h
-external.o: \
- external.c \
- h5test.h \
+ ../src/H5Rprivate.h \
+ ../src/H5Tprivate.h \
+ ../src/H5Gprivate.h \
+ ../src/H5Bprivate.h \
+ ../src/H5Eprivate.h
+hyperslab.o: \
+ hyperslab.c \
+ ../src/H5private.h \
+ ../src/H5public.h \
+ ../src/H5config.h \
+ ../src/H5api_adpt.h
+iopipe.o: \
+ iopipe.c \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
@@ -265,14 +280,9 @@ external.o: \
../src/H5Rpublic.h \
../src/H5RApublic.h \
../src/H5Spublic.h \
- ../src/H5Tpublic.h \
- ../src/H5private.h \
- ../src/H5Tpkg.h \
- ../src/H5HGprivate.h \
- ../src/H5Fprivate.h \
- ../src/H5Rprivate.h
-fillval.o: \
- fillval.c \
+ ../src/H5Tpublic.h
+istore.o: \
+ istore.c \
h5test.h \
../src/hdf5.h \
../src/H5public.h \
@@ -301,9 +311,19 @@ fillval.o: \
../src/H5Tpkg.h \
../src/H5HGprivate.h \
../src/H5Fprivate.h \
- ../src/H5Rprivate.h
-flush1.o: \
- flush1.c \
+ ../src/H5Rprivate.h \
+ ../src/H5Tprivate.h \
+ ../src/H5Gprivate.h \
+ ../src/H5Bprivate.h \
+ ../src/H5Dprivate.h \
+ ../src/H5Oprivate.h \
+ ../src/H5Sprivate.h \
+ ../src/H5Zprivate.h \
+ ../src/H5Iprivate.h \
+ ../src/H5Pprivate.h \
+ ../src/H5MMprivate.h
+lheap.o: \
+ lheap.c \
h5test.h \
../src/hdf5.h \
../src/H5public.h \
@@ -332,9 +352,13 @@ flush1.o: \
../src/H5Tpkg.h \
../src/H5HGprivate.h \
../src/H5Fprivate.h \
- ../src/H5Rprivate.h
-flush2.o: \
- flush2.c \
+ ../src/H5Rprivate.h \
+ ../src/H5Tprivate.h \
+ ../src/H5Gprivate.h \
+ ../src/H5Bprivate.h \
+ ../src/H5HLprivate.h
+links.o: \
+ links.c \
h5test.h \
../src/hdf5.h \
../src/H5public.h \
@@ -363,9 +387,10 @@ flush2.o: \
../src/H5Tpkg.h \
../src/H5HGprivate.h \
../src/H5Fprivate.h \
- ../src/H5Rprivate.h
-gheap.o: \
- gheap.c \
+ ../src/H5Rprivate.h \
+ ../src/H5Tprivate.h
+mount.o: \
+ mount.c \
h5test.h \
../src/hdf5.h \
../src/H5public.h \
@@ -395,17 +420,9 @@ gheap.o: \
../src/H5HGprivate.h \
../src/H5Fprivate.h \
../src/H5Rprivate.h \
- ../src/H5Tprivate.h \
- ../src/H5Gprivate.h \
- ../src/H5Bprivate.h
-hyperslab.o: \
- hyperslab.c \
- ../src/H5private.h \
- ../src/H5public.h \
- ../src/H5config.h \
- ../src/H5api_adpt.h
-iopipe.o: \
- iopipe.c \
+ ../src/H5Tprivate.h
+overhead.o: \
+ overhead.c \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
@@ -429,9 +446,8 @@ iopipe.o: \
../src/H5RApublic.h \
../src/H5Spublic.h \
../src/H5Tpublic.h
-istore.o: \
- istore.c \
- h5test.h \
+ragged.o: \
+ ragged.c \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
@@ -455,22 +471,9 @@ istore.o: \
../src/H5RApublic.h \
../src/H5Spublic.h \
../src/H5Tpublic.h \
- ../src/H5private.h \
- ../src/H5Tpkg.h \
- ../src/H5HGprivate.h \
- ../src/H5Fprivate.h \
- ../src/H5Rprivate.h \
- ../src/H5Tprivate.h \
- ../src/H5Gprivate.h \
- ../src/H5Bprivate.h \
- ../src/H5Dprivate.h \
- ../src/H5Oprivate.h \
- ../src/H5Sprivate.h \
- ../src/H5Zprivate.h \
- ../src/H5Iprivate.h \
- ../src/H5Pprivate.h
-lheap.o: \
- lheap.c \
+ ../src/H5private.h
+stab.o: \
+ stab.c \
h5test.h \
../src/hdf5.h \
../src/H5public.h \
@@ -502,20 +505,23 @@ lheap.o: \
../src/H5Rprivate.h \
../src/H5Tprivate.h \
../src/H5Gprivate.h \
- ../src/H5Bprivate.h
-links.o: \
- links.c \
- h5test.h \
- ../src/hdf5.h \
+ ../src/H5Bprivate.h \
+ ../src/H5Gpkg.h
+tattr.o: \
+ tattr.c \
+ testhdf5.h \
+ ../src/H5private.h \
../src/H5public.h \
../src/H5config.h \
../src/H5api_adpt.h \
+ ../src/H5Eprivate.h \
+ ../src/H5Epublic.h \
../src/H5Ipublic.h \
+ ../src/hdf5.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
- ../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
@@ -525,28 +531,83 @@ links.o: \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
- ../src/H5Rpublic.h \
- ../src/H5RApublic.h \
+ ../src/H5Rpublic.h
+testhdf5.o: \
+ testhdf5.c \
+ testhdf5.h \
+ ../src/H5private.h \
+ ../src/H5public.h \
+ ../src/H5config.h \
+ ../src/H5api_adpt.h
+tfile.o: \
+ tfile.c \
+ testhdf5.h \
+ ../src/H5private.h \
+ ../src/H5public.h \
+ ../src/H5config.h \
+ ../src/H5api_adpt.h \
+ ../src/H5Eprivate.h \
+ ../src/H5Epublic.h \
+ ../src/H5Ipublic.h \
+ ../src/H5Bprivate.h \
+ ../src/H5Bpublic.h \
+ ../src/H5Fprivate.h \
+ ../src/H5Fpublic.h \
+ ../src/H5Dpublic.h \
+ ../src/H5Pprivate.h
+th5s.o: \
+ th5s.c \
+ testhdf5.h \
+ ../src/H5private.h \
+ ../src/H5public.h \
+ ../src/H5config.h \
+ ../src/H5api_adpt.h \
+ ../src/H5Eprivate.h \
+ ../src/H5Epublic.h \
+ ../src/H5Ipublic.h \
+ ../src/H5Bprivate.h \
+ ../src/H5Bpublic.h \
+ ../src/H5Fprivate.h \
+ ../src/H5Fpublic.h \
+ ../src/H5Dpublic.h \
+ ../src/H5Sprivate.h \
../src/H5Spublic.h \
+ ../src/H5Gprivate.h \
+ ../src/H5Gpublic.h \
+ ../src/H5Oprivate.h \
+ ../src/H5Opublic.h \
+ ../src/H5HGprivate.h \
+ ../src/H5HGpublic.h \
+ ../src/H5Tprivate.h \
../src/H5Tpublic.h \
+ ../src/H5Zprivate.h \
+ ../src/H5Zpublic.h \
+ ../src/H5Pprivate.h
+tmeta.o: \
+ tmeta.c \
+ testhdf5.h \
../src/H5private.h \
- ../src/H5Tpkg.h \
- ../src/H5HGprivate.h \
- ../src/H5Fprivate.h \
- ../src/H5Rprivate.h
-mount.o: \
- mount.c \
- h5test.h \
- ../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
../src/H5api_adpt.h \
+ ../src/H5Eprivate.h \
+ ../src/H5Epublic.h \
+ ../src/H5Ipublic.h
+trefer.o: \
+ trefer.c \
+ testhdf5.h \
+ ../src/H5private.h \
+ ../src/H5public.h \
+ ../src/H5config.h \
+ ../src/H5api_adpt.h \
+ ../src/H5Eprivate.h \
+ ../src/H5Epublic.h \
../src/H5Ipublic.h \
+ ../src/hdf5.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
- ../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
@@ -556,28 +617,22 @@ mount.o: \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
- ../src/H5Rpublic.h \
- ../src/H5RApublic.h \
- ../src/H5Spublic.h \
- ../src/H5Tpublic.h \
+ ../src/H5Rpublic.h
+tselect.o: \
+ tselect.c \
+ testhdf5.h \
../src/H5private.h \
- ../src/H5Tpkg.h \
- ../src/H5HGprivate.h \
- ../src/H5Fprivate.h \
- ../src/H5Rprivate.h
-mtime.o: \
- mtime.c \
- h5test.h \
- ../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
../src/H5api_adpt.h \
+ ../src/H5Eprivate.h \
+ ../src/H5Epublic.h \
../src/H5Ipublic.h \
+ ../src/hdf5.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
- ../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
@@ -587,17 +642,9 @@ mtime.o: \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
- ../src/H5Rpublic.h \
- ../src/H5RApublic.h \
- ../src/H5Spublic.h \
- ../src/H5Tpublic.h \
- ../src/H5private.h \
- ../src/H5Tpkg.h \
- ../src/H5HGprivate.h \
- ../src/H5Fprivate.h \
- ../src/H5Rprivate.h
-ohdr.o: \
- ohdr.c \
+ ../src/H5Rpublic.h
+unlink.o: \
+ unlink.c \
h5test.h \
../src/hdf5.h \
../src/H5public.h \
@@ -627,14 +674,10 @@ ohdr.o: \
../src/H5HGprivate.h \
../src/H5Fprivate.h \
../src/H5Rprivate.h \
- ../src/H5Tprivate.h \
- ../src/H5Gprivate.h \
- ../src/H5Bprivate.h \
- ../src/H5Iprivate.h \
- ../src/H5Oprivate.h \
- ../src/H5Sprivate.h
-overhead.o: \
- overhead.c \
+ ../src/H5Tprivate.h
+external.o: \
+ external.c \
+ h5test.h \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
@@ -657,9 +700,16 @@ overhead.o: \
../src/H5Rpublic.h \
../src/H5RApublic.h \
../src/H5Spublic.h \
- ../src/H5Tpublic.h
-ragged.o: \
- ragged.c \
+ ../src/H5Tpublic.h \
+ ../src/H5private.h \
+ ../src/H5Tpkg.h \
+ ../src/H5HGprivate.h \
+ ../src/H5Fprivate.h \
+ ../src/H5Rprivate.h \
+ ../src/H5Tprivate.h
+big.o: \
+ big.c \
+ h5test.h \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
@@ -683,9 +733,14 @@ ragged.o: \
../src/H5RApublic.h \
../src/H5Spublic.h \
../src/H5Tpublic.h \
- ../src/H5private.h
-stab.o: \
- stab.c \
+ ../src/H5private.h \
+ ../src/H5Tpkg.h \
+ ../src/H5HGprivate.h \
+ ../src/H5Fprivate.h \
+ ../src/H5Rprivate.h \
+ ../src/H5Tprivate.h
+cmpd_dset.o: \
+ cmpd_dset.c \
h5test.h \
../src/hdf5.h \
../src/H5public.h \
@@ -715,24 +770,20 @@ stab.o: \
../src/H5HGprivate.h \
../src/H5Fprivate.h \
../src/H5Rprivate.h \
- ../src/H5Tprivate.h \
- ../src/H5Gprivate.h \
- ../src/H5Bprivate.h
-tattr.o: \
- tattr.c \
- testhdf5.h \
- ../src/H5private.h \
+ ../src/H5Tprivate.h
+mtime.o: \
+ mtime.c \
+ h5test.h \
+ ../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
../src/H5api_adpt.h \
- ../src/H5Eprivate.h \
- ../src/H5Epublic.h \
../src/H5Ipublic.h \
- ../src/hdf5.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
+ ../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
@@ -742,83 +793,29 @@ tattr.o: \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
- ../src/H5Rpublic.h
-testhdf5.o: \
- testhdf5.c \
- testhdf5.h \
- ../src/H5private.h \
- ../src/H5public.h \
- ../src/H5config.h \
- ../src/H5api_adpt.h
-tfile.o: \
- tfile.c \
- testhdf5.h \
- ../src/H5private.h \
- ../src/H5public.h \
- ../src/H5config.h \
- ../src/H5api_adpt.h \
- ../src/H5Eprivate.h \
- ../src/H5Epublic.h \
- ../src/H5Ipublic.h \
- ../src/H5Bprivate.h \
- ../src/H5Bpublic.h \
- ../src/H5Fprivate.h \
- ../src/H5Fpublic.h \
- ../src/H5Dpublic.h \
- ../src/H5Pprivate.h
-th5s.o: \
- th5s.c \
- testhdf5.h \
- ../src/H5private.h \
- ../src/H5public.h \
- ../src/H5config.h \
- ../src/H5api_adpt.h \
- ../src/H5Eprivate.h \
- ../src/H5Epublic.h \
- ../src/H5Ipublic.h \
- ../src/H5Bprivate.h \
- ../src/H5Bpublic.h \
- ../src/H5Fprivate.h \
- ../src/H5Fpublic.h \
- ../src/H5Dpublic.h \
- ../src/H5Sprivate.h \
+ ../src/H5Rpublic.h \
+ ../src/H5RApublic.h \
../src/H5Spublic.h \
- ../src/H5Gprivate.h \
- ../src/H5Gpublic.h \
- ../src/H5Oprivate.h \
- ../src/H5Opublic.h \
- ../src/H5HGprivate.h \
- ../src/H5HGpublic.h \
- ../src/H5Tprivate.h \
../src/H5Tpublic.h \
- ../src/H5Zprivate.h \
- ../src/H5Zpublic.h \
- ../src/H5Pprivate.h
-tmeta.o: \
- tmeta.c \
- testhdf5.h \
- ../src/H5private.h \
- ../src/H5public.h \
- ../src/H5config.h \
- ../src/H5api_adpt.h \
- ../src/H5Eprivate.h \
- ../src/H5Epublic.h \
- ../src/H5Ipublic.h
-trefer.o: \
- trefer.c \
- testhdf5.h \
../src/H5private.h \
+ ../src/H5Tpkg.h \
+ ../src/H5HGprivate.h \
+ ../src/H5Fprivate.h \
+ ../src/H5Rprivate.h \
+ ../src/H5Tprivate.h
+ohdr.o: \
+ ohdr.c \
+ h5test.h \
+ ../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
../src/H5api_adpt.h \
- ../src/H5Eprivate.h \
- ../src/H5Epublic.h \
../src/H5Ipublic.h \
- ../src/hdf5.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
+ ../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
@@ -828,22 +825,35 @@ trefer.o: \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
- ../src/H5Rpublic.h
-tselect.o: \
- tselect.c \
- testhdf5.h \
+ ../src/H5Rpublic.h \
+ ../src/H5RApublic.h \
+ ../src/H5Spublic.h \
+ ../src/H5Tpublic.h \
../src/H5private.h \
+ ../src/H5Tpkg.h \
+ ../src/H5HGprivate.h \
+ ../src/H5Fprivate.h \
+ ../src/H5Rprivate.h \
+ ../src/H5Tprivate.h \
+ ../src/H5Gprivate.h \
+ ../src/H5Bprivate.h \
+ ../src/H5Iprivate.h \
+ ../src/H5Oprivate.h \
+ ../src/H5Sprivate.h \
+ ../src/H5Zprivate.h
+enum.o: \
+ enum.c \
+ h5test.h \
+ ../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
../src/H5api_adpt.h \
- ../src/H5Eprivate.h \
- ../src/H5Epublic.h \
../src/H5Ipublic.h \
- ../src/hdf5.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
+ ../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
@@ -853,9 +863,18 @@ tselect.o: \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
- ../src/H5Rpublic.h
-unlink.o: \
- unlink.c \
+ ../src/H5Rpublic.h \
+ ../src/H5RApublic.h \
+ ../src/H5Spublic.h \
+ ../src/H5Tpublic.h \
+ ../src/H5private.h \
+ ../src/H5Tpkg.h \
+ ../src/H5HGprivate.h \
+ ../src/H5Fprivate.h \
+ ../src/H5Rprivate.h \
+ ../src/H5Tprivate.h
+dsets.o: \
+ dsets.c \
h5test.h \
../src/hdf5.h \
../src/H5public.h \
@@ -884,9 +903,10 @@ unlink.o: \
../src/H5Tpkg.h \
../src/H5HGprivate.h \
../src/H5Fprivate.h \
- ../src/H5Rprivate.h
-enum.o: \
- enum.c \
+ ../src/H5Rprivate.h \
+ ../src/H5Tprivate.h
+dtypes.o: \
+ dtypes.c \
h5test.h \
../src/hdf5.h \
../src/H5public.h \
@@ -915,4 +935,5 @@ enum.o: \
../src/H5Tpkg.h \
../src/H5HGprivate.h \
../src/H5Fprivate.h \
- ../src/H5Rprivate.h
+ ../src/H5Rprivate.h \
+ ../src/H5Tprivate.h
diff --git a/test/big.c b/test/big.c
index d20f8fb..d414e7d 100644
--- a/test/big.c
+++ b/test/big.c
@@ -128,7 +128,7 @@ enough_room(hid_t fapl)
if ((fd[i]=open(name, O_RDWR|O_CREAT|O_TRUNC, 0666))<0) {
goto done;
}
- if ((ssize_t)size != lseek(fd[i], size, SEEK_SET)) {
+ if ((off_t)size != lseek(fd[i], (off_t)size, SEEK_SET)) {
goto done;
}
if (1!=write(fd[i], "X", 1)) {
diff --git a/test/cmpd_dset.c b/test/cmpd_dset.c
index f3ccf39..08499a6 100644
--- a/test/cmpd_dset.c
+++ b/test/cmpd_dset.c
@@ -122,7 +122,6 @@ main (void)
/* Eleventh dataset */
s4_t *s11 = NULL;
- int ndims;
/* Other variables */
unsigned int i, j;
@@ -621,7 +620,6 @@ main (void)
TESTING("hyperslab part initialized write");
/* Create the memory array and initialize all fields to zero */
- ndims = 2;
f_offset[0] = NX/3;
f_offset[1] = NY/3;
h_size[0] = 2*NX/3 - f_offset[0];
diff --git a/test/dsets.c b/test/dsets.c
index 49b5f50..4b221b2 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -159,7 +159,6 @@ static herr_t
test_simple_io(hid_t file)
{
hid_t dataset, space, xfer;
- herr_t status;
int points[100][200], check[100][200];
int i, j, n;
hsize_t dims[2];
@@ -183,7 +182,7 @@ test_simple_io(hid_t file)
tconv_buf = malloc (1000);
xfer = H5Pcreate (H5P_DATASET_XFER);
assert (xfer>=0);
- if ((status = H5Pset_buffer (xfer, 1000, tconv_buf, NULL))<0) goto error;
+ if (H5Pset_buffer (xfer, 1000, tconv_buf, NULL)<0) goto error;
/* Create the dataset */
if ((dataset = H5Dcreate(file, DSET_SIMPLE_IO_NAME, H5T_NATIVE_INT, space,
@@ -722,16 +721,19 @@ int
main(void)
{
hid_t file, grp, fapl;
- int nerrors=0, mdc_nelmts;
+ int nerrors=0;
char filename[1024];
h5_reset();
fapl = h5_fileaccess();
#if 0
- /* Turn off raw data cache */
- if (H5Pget_cache(fapl, &mdc_nelmts, NULL, NULL, NULL)<0) goto error;
- if (H5Pset_cache(fapl, mdc_nelmts, 0, 0, 0.0)<0) goto error;
+ {
+ /* Turn off raw data cache */
+ int mdc_nelmts;
+ if (H5Pget_cache(fapl, &mdc_nelmts, NULL, NULL, NULL)<0) goto error;
+ if (H5Pset_cache(fapl, mdc_nelmts, 0, 0, 0.0)<0) goto error;
+ }
#endif
h5_fixname(FILENAME[0], fapl, filename, sizeof filename);
diff --git a/test/dtypes.c b/test/dtypes.c
index 22ebe2a..588815e 100644
--- a/test/dtypes.c
+++ b/test/dtypes.c
@@ -66,7 +66,9 @@ typedef enum int_t {
} int_t;
/* Count the number of overflows */
+#ifdef SHOW_OVERFLOWS
static int noverflows_g = 0;
+#endif
/* Skip overflow tests if non-zero */
static int skip_overflow_tests_g = 0;
@@ -1393,7 +1395,9 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
dst_size = H5Tget_size(dst);
buf = aligned_malloc(nelmts*MAX(src_size, dst_size));
saved = aligned_malloc(nelmts*MAX(src_size, dst_size));
+#ifdef SHOW_OVERFLOWS
noverflows_g = 0;
+#endif
/* The tests */
for (i=0; i<ntests; i++) {
@@ -1425,46 +1429,46 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
switch (src_type) {
case INT_CHAR:
memcpy(&aligned, (signed char*)saved+j, sizeof(char));
- hw_char = *((signed char*)&aligned);
+ hw_char = (char)(*((signed char*)&aligned));
break;
case INT_UCHAR:
memcpy(&aligned, (unsigned char*)saved+j, sizeof(char));
- hw_char = *((unsigned char*)&aligned);
+ hw_char = (char)(*((unsigned char*)&aligned));
break;
case INT_SHORT:
memcpy(&aligned, (short*)saved+j, sizeof(short));
- hw_char = *((short*)&aligned);
+ hw_char = (char)(*((short*)&aligned));
break;
case INT_USHORT:
memcpy(&aligned, (unsigned short*)saved+j,
sizeof(unsigned short));
- hw_char = *((unsigned short*)&aligned);
+ hw_char = (char)(*((unsigned short*)&aligned));
break;
case INT_INT:
memcpy(&aligned, (int*)saved+j, sizeof(int));
- hw_char = *((int*)&aligned);
+ hw_char = (char)(*((int*)&aligned));
break;
case INT_UINT:
memcpy(&aligned, (unsigned*)saved+j, sizeof(unsigned));
- hw_char = *((unsigned*)&aligned);
+ hw_char = (char)(*((unsigned*)&aligned));
break;
case INT_LONG:
memcpy(&aligned, (long*)saved+j, sizeof(long));
- hw_char = *((long*)&aligned);
+ hw_char = (char)(*((long*)&aligned));
break;
case INT_ULONG:
memcpy(&aligned, (unsigned long*)saved+j,
sizeof(unsigned long));
- hw_char = *((unsigned long*)&aligned);
+ hw_char = (char)(*((unsigned long*)&aligned));
break;
case INT_LLONG:
memcpy(&aligned, (long_long*)saved+j, sizeof(long_long));
- hw_char = *((long_long*)&aligned);
+ hw_char = (char)(*((long_long*)&aligned));
break;
case INT_ULLONG:
memcpy(&aligned, (unsigned long_long*)saved+j,
sizeof(unsigned long_long));
- hw_char = *((unsigned long_long*)&aligned);
+ hw_char = (char)(*((unsigned long_long*)&aligned));
break;
case INT_OTHER:
break;
@@ -1475,47 +1479,48 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
case INT_CHAR:
memcpy(&aligned, (signed char*)saved+j,
sizeof(signed char));
- hw_uchar = *((signed char*)&aligned);
+ hw_uchar = (unsigned char)(*((signed char*)&aligned));
break;
case INT_UCHAR:
memcpy(&aligned, (unsigned char*)saved+j,
sizeof(unsigned char));
- hw_uchar = *((unsigned char*)&aligned);
+ hw_uchar = (unsigned char)(*((unsigned char*)&aligned));
break;
case INT_SHORT:
memcpy(&aligned, (short*)saved+j, sizeof(short));
- hw_uchar = *((short*)&aligned);
+ hw_uchar = (unsigned char)(*((short*)&aligned));
break;
case INT_USHORT:
memcpy(&aligned, (unsigned short*)saved+j,
sizeof(unsigned short));
- hw_uchar = *((unsigned short*)&aligned);
+ hw_uchar = (unsigned char)(*((unsigned short*)&aligned));
break;
case INT_INT:
memcpy(&aligned, (int*)saved+j, sizeof(int));
- hw_uchar = *((int*)&aligned);
+ hw_uchar = (unsigned char)(*((int*)&aligned));
break;
case INT_UINT:
memcpy(&aligned, (unsigned*)saved+j, sizeof(unsigned));
- hw_uchar = *((unsigned*)&aligned);
+ hw_uchar = (unsigned char)(*((unsigned*)&aligned));
break;
case INT_LONG:
memcpy(&aligned, (long*)saved+j, sizeof(long));
- hw_uchar = *((long*)&aligned);
+ hw_uchar = (unsigned char)(*((long*)&aligned));
break;
case INT_ULONG:
memcpy(&aligned, (unsigned long*)saved+j,
sizeof(unsigned long));
- hw_uchar = *((unsigned long*)&aligned);
+ hw_uchar = (unsigned char)(*((unsigned long*)&aligned));
break;
case INT_LLONG:
memcpy(&aligned, (long_long*)saved+j, sizeof(long_long));
- hw_uchar = *((long_long*)&aligned);
+ hw_uchar = (unsigned char)(*((long_long*)&aligned));
break;
case INT_ULLONG:
memcpy(&aligned, (unsigned long_long*)saved+j,
sizeof(unsigned long_long));
- hw_uchar = *((unsigned long_long*)&aligned);
+ hw_uchar = (unsigned char)(*((unsigned long_long*)
+ &aligned));
break;
case INT_OTHER:
break;
@@ -1526,47 +1531,47 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
case INT_CHAR:
memcpy(&aligned, (signed char*)saved+j,
sizeof(signed char));
- hw_short = *((signed char*)&aligned);
+ hw_short = (short)(*((signed char*)&aligned));
break;
case INT_UCHAR:
memcpy(&aligned, (unsigned char*)saved+j,
sizeof(unsigned char));
- hw_short = *((unsigned char*)&aligned);
+ hw_short = (short)(*((unsigned char*)&aligned));
break;
case INT_SHORT:
memcpy(&aligned, (short*)saved+j, sizeof(short));
- hw_short = *((short*)&aligned);
+ hw_short = (short)(*((short*)&aligned));
break;
case INT_USHORT:
memcpy(&aligned, (unsigned short*)saved+j,
sizeof(unsigned short));
- hw_short = *((unsigned short*)&aligned);
+ hw_short = (short)(*((unsigned short*)&aligned));
break;
case INT_INT:
memcpy(&aligned, (int*)saved+j, sizeof(int));
- hw_short = *((int*)&aligned);
+ hw_short = (short)(*((int*)&aligned));
break;
case INT_UINT:
memcpy(&aligned, (unsigned*)saved+j, sizeof(unsigned));
- hw_short = *((unsigned*)&aligned);
+ hw_short = (short)(*((unsigned*)&aligned));
break;
case INT_LONG:
memcpy(&aligned, (long*)saved+j, sizeof(long));
- hw_short = *((long*)&aligned);
+ hw_short = (short)(*((long*)&aligned));
break;
case INT_ULONG:
memcpy(&aligned, (unsigned long*)saved+j,
sizeof(unsigned long));
- hw_short = *((unsigned long*)&aligned);
+ hw_short = (short)(*((unsigned long*)&aligned));
break;
case INT_LLONG:
memcpy(&aligned, (long_long*)saved+j, sizeof(long_long));
- hw_short = *((long_long*)&aligned);
+ hw_short = (short)(*((long_long*)&aligned));
break;
case INT_ULLONG:
memcpy(&aligned, (unsigned long_long*)saved+j,
sizeof(unsigned long_long));
- hw_short = *((unsigned long_long*)&aligned);
+ hw_short = (short)(*((unsigned long_long*)&aligned));
break;
case INT_OTHER:
break;
@@ -1577,47 +1582,48 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
case INT_CHAR:
memcpy(&aligned, (signed char*)saved+j,
sizeof(signed char));
- hw_ushort = *((signed char*)&aligned);
+ hw_ushort = (unsigned short)(*((signed char*)&aligned));
break;
case INT_UCHAR:
memcpy(&aligned, (unsigned char*)saved+j,
sizeof(unsigned char));
- hw_ushort = *((unsigned char*)&aligned);
+ hw_ushort = (unsigned short)(*((unsigned char*)&aligned));
break;
case INT_SHORT:
memcpy(&aligned, (short*)saved+j, sizeof(short));
- hw_ushort = *((short*)&aligned);
+ hw_ushort = (unsigned short)(*((short*)&aligned));
break;
case INT_USHORT:
memcpy(&aligned, (unsigned short*)saved+j,
sizeof(unsigned short));
- hw_ushort = *((unsigned short*)&aligned);
+ hw_ushort = (unsigned short)(*((unsigned short*)&aligned));
break;
case INT_INT:
memcpy(&aligned, (int*)saved+j, sizeof(int));
- hw_ushort = *((int*)&aligned);
+ hw_ushort = (unsigned short)(*((int*)&aligned));
break;
case INT_UINT:
memcpy(&aligned, (unsigned*)saved+j, sizeof(unsigned));
- hw_ushort = *((unsigned*)&aligned);
+ hw_ushort = (unsigned short)(*((unsigned*)&aligned));
break;
case INT_LONG:
memcpy(&aligned, (long*)saved+j, sizeof(long));
- hw_ushort = *((long*)&aligned);
+ hw_ushort = (unsigned short)(*((long*)&aligned));
break;
case INT_ULONG:
memcpy(&aligned, (unsigned long*)saved+j,
sizeof(unsigned long));
- hw_ushort = *((unsigned long*)&aligned);
+ hw_ushort = (unsigned short)(*((unsigned long*)&aligned));
break;
case INT_LLONG:
memcpy(&aligned, (long_long*)saved+j, sizeof(long_long));
- hw_ushort = *((long_long*)&aligned);
+ hw_ushort = (unsigned short)(*((long_long*)&aligned));
break;
case INT_ULLONG:
memcpy(&aligned, (unsigned long_long*)saved+j,
sizeof(unsigned long_long));
- hw_ushort = *((unsigned long_long*)&aligned);
+ hw_ushort = (unsigned short)(*((unsigned long_long*)
+ &aligned));
break;
case INT_OTHER:
break;
@@ -1628,47 +1634,47 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
case INT_CHAR:
memcpy(&aligned, (signed char*)saved+j,
sizeof(signed char));
- hw_int = *((signed char*)&aligned);
+ hw_int = (int)(*((signed char*)&aligned));
break;
case INT_UCHAR:
memcpy(&aligned, (unsigned char*)saved+j,
sizeof(unsigned char));
- hw_int = *((unsigned char*)&aligned);
+ hw_int = (int)(*((unsigned char*)&aligned));
break;
case INT_SHORT:
memcpy(&aligned, (short*)saved+j, sizeof(short));
- hw_int = *((short*)&aligned);
+ hw_int = (int)(*((short*)&aligned));
break;
case INT_USHORT:
memcpy(&aligned, (unsigned short*)saved+j,
sizeof(unsigned short));
- hw_int = *((unsigned short*)&aligned);
+ hw_int = (int)(*((unsigned short*)&aligned));
break;
case INT_INT:
memcpy(&aligned, (int*)saved+j, sizeof(int));
- hw_int = *((int*)&aligned);
+ hw_int = (int)(*((int*)&aligned));
break;
case INT_UINT:
memcpy(&aligned, (unsigned*)saved+j, sizeof(unsigned));
- hw_int = *((unsigned*)&aligned);
+ hw_int = (int)(*((unsigned*)&aligned));
break;
case INT_LONG:
memcpy(&aligned, (long*)saved+j, sizeof(long));
- hw_int = *((long*)&aligned);
+ hw_int = (int)(*((long*)&aligned));
break;
case INT_ULONG:
memcpy(&aligned, (unsigned long*)saved+j,
sizeof(unsigned long));
- hw_int = *((unsigned long*)&aligned);
+ hw_int = (int)(*((unsigned long*)&aligned));
break;
case INT_LLONG:
memcpy(&aligned, (long_long*)saved+j, sizeof(long_long));
- hw_int = *((long_long*)&aligned);
+ hw_int = (int)(*((long_long*)&aligned));
break;
case INT_ULLONG:
memcpy(&aligned, (unsigned long_long*)saved+j,
sizeof(unsigned long_long));
- hw_int = *((unsigned long_long*)&aligned);
+ hw_int = (int)(*((unsigned long_long*)&aligned));
break;
case INT_OTHER:
break;
@@ -1679,47 +1685,47 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
case INT_CHAR:
memcpy(&aligned, (signed char*)saved+j,
sizeof(signed char));
- hw_uint = *((signed char*)&aligned);
+ hw_uint = (unsigned int)(*((signed char*)&aligned));
break;
case INT_UCHAR:
memcpy(&aligned, (unsigned char*)saved+j,
sizeof(unsigned char));
- hw_uint = *((unsigned char*)&aligned);
+ hw_uint = (unsigned int)(*((unsigned char*)&aligned));
break;
case INT_SHORT:
memcpy(&aligned, (short*)saved+j, sizeof(short));
- hw_uint = *((short*)&aligned);
+ hw_uint = (unsigned int)(*((short*)&aligned));
break;
case INT_USHORT:
memcpy(&aligned, (unsigned short*)saved+j,
sizeof(unsigned short));
- hw_uint = *((unsigned short*)&aligned);
+ hw_uint = (unsigned int)(*((unsigned short*)&aligned));
break;
case INT_INT:
memcpy(&aligned, (int*)saved+j, sizeof(int));
- hw_uint = *((int*)&aligned);
+ hw_uint = (unsigned int)(*((int*)&aligned));
break;
case INT_UINT:
memcpy(&aligned, (unsigned*)saved+j, sizeof(unsigned));
- hw_uint = *((unsigned*)&aligned);
+ hw_uint = (unsigned int)(*((unsigned*)&aligned));
break;
case INT_LONG:
memcpy(&aligned, (long*)saved+j, sizeof(long));
- hw_uint = *((long*)&aligned);
+ hw_uint = (unsigned int)(*((long*)&aligned));
break;
case INT_ULONG:
memcpy(&aligned, (unsigned long*)saved+j,
sizeof(unsigned long));
- hw_uint = *((unsigned long*)&aligned);
+ hw_uint = (unsigned int)(*((unsigned long*)&aligned));
break;
case INT_LLONG:
memcpy(&aligned, (long_long*)saved+j, sizeof(long_long));
- hw_uint = *((long_long*)&aligned);
+ hw_uint = (unsigned int)(*((long_long*)&aligned));
break;
case INT_ULLONG:
memcpy(&aligned, (unsigned long_long*)saved+j,
sizeof(unsigned long_long));
- hw_uint = *((unsigned long_long*)&aligned);
+ hw_uint = (unsigned int)(*((unsigned long_long*)&aligned));
break;
case INT_OTHER:
break;
@@ -1730,47 +1736,47 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
case INT_CHAR:
memcpy(&aligned, (signed char*)saved+j,
sizeof(signed char));
- hw_long = *((signed char*)&aligned);
+ hw_long = (long int)(*((signed char*)&aligned));
break;
case INT_UCHAR:
memcpy(&aligned, (unsigned char*)saved+j,
sizeof(unsigned char));
- hw_long = *((unsigned char*)&aligned);
+ hw_long = (long int)(*((unsigned char*)&aligned));
break;
case INT_SHORT:
memcpy(&aligned, (short*)saved+j, sizeof(short));
- hw_long = *((short*)&aligned);
+ hw_long = (long int)(*((short*)&aligned));
break;
case INT_USHORT:
memcpy(&aligned, (unsigned short*)saved+j,
sizeof(unsigned short));
- hw_long = *((unsigned short*)&aligned);
+ hw_long = (long int)(*((unsigned short*)&aligned));
break;
case INT_INT:
memcpy(&aligned, (int*)saved+j, sizeof(int));
- hw_long = *((int*)&aligned);
+ hw_long = (long int)(*((int*)&aligned));
break;
case INT_UINT:
memcpy(&aligned, (unsigned*)saved+j, sizeof(unsigned));
- hw_long = *((unsigned*)&aligned);
+ hw_long = (long int)(*((unsigned*)&aligned));
break;
case INT_LONG:
memcpy(&aligned, (long*)saved+j, sizeof(long));
- hw_long = *((long*)&aligned);
+ hw_long = (long int)(*((long*)&aligned));
break;
case INT_ULONG:
memcpy(&aligned, (unsigned long*)saved+j,
sizeof(unsigned long));
- hw_long = *((unsigned long*)&aligned);
+ hw_long = (long int)(*((unsigned long*)&aligned));
break;
case INT_LLONG:
memcpy(&aligned, (long_long*)saved+j, sizeof(long_long));
- hw_long = *((long_long*)&aligned);
+ hw_long = (long int)(*((long_long*)&aligned));
break;
case INT_ULLONG:
memcpy(&aligned, (unsigned long_long*)saved+j,
sizeof(unsigned long_long));
- hw_long = *((unsigned long_long*)&aligned);
+ hw_long = (long int)(*((unsigned long_long*)&aligned));
break;
case INT_OTHER:
break;
@@ -1781,47 +1787,48 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
case INT_CHAR:
memcpy(&aligned, (signed char*)saved+j,
sizeof(signed char));
- hw_ulong = *((signed char*)&aligned);
+ hw_ulong = (unsigned long)(*((signed char*)&aligned));
break;
case INT_UCHAR:
memcpy(&aligned, (unsigned char*)saved+j,
sizeof(unsigned char));
- hw_ulong = *((unsigned char*)&aligned);
+ hw_ulong = (unsigned long)(*((unsigned char*)&aligned));
break;
case INT_SHORT:
memcpy(&aligned, (short*)saved+j, sizeof(short));
- hw_ulong = *((short*)&aligned);
+ hw_ulong = (unsigned long)(*((short*)&aligned));
break;
case INT_USHORT:
memcpy(&aligned, (unsigned short*)saved+j,
sizeof(unsigned short));
- hw_ulong = *((unsigned short*)&aligned);
+ hw_ulong = (unsigned long)(*((unsigned short*)&aligned));
break;
case INT_INT:
memcpy(&aligned, (int*)saved+j, sizeof(int));
- hw_ulong = *((int*)&aligned);
+ hw_ulong = (unsigned long)(*((int*)&aligned));
break;
case INT_UINT:
memcpy(&aligned, (unsigned*)saved+j, sizeof(unsigned));
- hw_ulong = *((unsigned*)&aligned);
+ hw_ulong = (unsigned long)(*((unsigned*)&aligned));
break;
case INT_LONG:
memcpy(&aligned, (long*)saved+j, sizeof(long));
- hw_ulong = *((long*)&aligned);
+ hw_ulong = (unsigned long)(*((long*)&aligned));
break;
case INT_ULONG:
memcpy(&aligned, (unsigned long*)saved+j,
sizeof(unsigned long));
- hw_ulong = *((unsigned long*)&aligned);
+ hw_ulong = (unsigned long)(*((unsigned long*)&aligned));
break;
case INT_LLONG:
memcpy(&aligned, (long_long*)saved+j, sizeof(long_long));
- hw_ulong = *((long_long*)&aligned);
+ hw_ulong = (unsigned long)(*((long_long*)&aligned));
break;
case INT_ULLONG:
memcpy(&aligned, (unsigned long_long*)saved+j,
sizeof(unsigned long_long));
- hw_ulong = *((unsigned long_long*)&aligned);
+ hw_ulong = (unsigned long)(*((unsigned long_long*)
+ &aligned));
break;
case INT_OTHER:
break;
@@ -1832,47 +1839,47 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
case INT_CHAR:
memcpy(&aligned, (signed char*)saved+j,
sizeof(signed char));
- hw_llong = *((signed char*)&aligned);
+ hw_llong = (long_long)(*((signed char*)&aligned));
break;
case INT_UCHAR:
memcpy(&aligned, (unsigned char*)saved+j,
sizeof(unsigned char));
- hw_llong = *((unsigned char*)&aligned);
+ hw_llong = (long_long)(*((unsigned char*)&aligned));
break;
case INT_SHORT:
memcpy(&aligned, (short*)saved+j, sizeof(short));
- hw_llong = *((short*)&aligned);
+ hw_llong = (long_long)(*((short*)&aligned));
break;
case INT_USHORT:
memcpy(&aligned, (unsigned short*)saved+j,
sizeof(unsigned short));
- hw_llong = *((unsigned short*)&aligned);
+ hw_llong = (long_long)(*((unsigned short*)&aligned));
break;
case INT_INT:
memcpy(&aligned, (int*)saved+j, sizeof(int));
- hw_llong = *((int*)&aligned);
+ hw_llong = (long_long)(*((int*)&aligned));
break;
case INT_UINT:
memcpy(&aligned, (unsigned*)saved+j, sizeof(unsigned));
- hw_llong = *((unsigned*)&aligned);
+ hw_llong = (long_long)(*((unsigned*)&aligned));
break;
case INT_LONG:
memcpy(&aligned, (long*)saved+j, sizeof(long));
- hw_llong = *((long*)&aligned);
+ hw_llong = (long_long)(*((long*)&aligned));
break;
case INT_ULONG:
memcpy(&aligned, (unsigned long*)saved+j,
sizeof(unsigned long));
- hw_llong = *((unsigned long*)&aligned);
+ hw_llong = (long_long)(*((unsigned long*)&aligned));
break;
case INT_LLONG:
memcpy(&aligned, (long_long*)saved+j, sizeof(long_long));
- hw_llong = *((long_long*)&aligned);
+ hw_llong = (long_long)(*((long_long*)&aligned));
break;
case INT_ULLONG:
memcpy(&aligned, (unsigned long_long*)saved+j,
sizeof(unsigned long_long));
- hw_llong = *((unsigned long_long*)&aligned);
+ hw_llong = (long_long)(*((unsigned long_long*)&aligned));
break;
case INT_OTHER:
break;
@@ -1883,47 +1890,52 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst)
case INT_CHAR:
memcpy(&aligned, (signed char*)saved+j,
sizeof(signed char));
- hw_ullong = *((signed char*)&aligned);
+ hw_ullong = (unsigned long_long)(*((signed char*)
+ &aligned));
break;
case INT_UCHAR:
memcpy(&aligned, (unsigned char*)saved+j,
sizeof(unsigned char));
- hw_ullong = *((unsigned char*)&aligned);
+ hw_ullong = (unsigned long_long)(*((unsigned char*)
+ &aligned));
break;
case INT_SHORT:
memcpy(&aligned, (short*)saved+j, sizeof(short));
- hw_ullong = *((short*)&aligned);
+ hw_ullong = (unsigned long_long)(*((short*)&aligned));
break;
case INT_USHORT:
memcpy(&aligned, (unsigned short*)saved+j,
sizeof(unsigned short));
- hw_ullong = *((unsigned short*)&aligned);
+ hw_ullong = (unsigned long_long)(*((unsigned short*)
+ &aligned));
break;
case INT_INT:
memcpy(&aligned, (int*)saved+j, sizeof(int));
- hw_ullong = *((int*)&aligned);
+ hw_ullong = (unsigned long_long)(*((int*)&aligned));
break;
case INT_UINT:
memcpy(&aligned, (unsigned*)saved+j, sizeof(unsigned));
- hw_ullong = *((unsigned*)&aligned);
+ hw_ullong = (unsigned long_long)(*((unsigned*)&aligned));
break;
case INT_LONG:
memcpy(&aligned, (long*)saved+j, sizeof(long));
- hw_ullong = *((long*)&aligned);
+ hw_ullong = (unsigned long_long)(*((long*)&aligned));
break;
case INT_ULONG:
memcpy(&aligned, (unsigned long*)saved+j,
sizeof(unsigned long));
- hw_ullong = *((unsigned long*)&aligned);
+ hw_ullong = (unsigned long_long)(*((unsigned long*)
+ &aligned));
break;
case INT_LLONG:
memcpy(&aligned, (long_long*)saved+j, sizeof(long_long));
- hw_ullong = *((long_long*)&aligned);
+ hw_ullong = (unsigned long_long)(*((long_long*)&aligned));
break;
case INT_ULLONG:
memcpy(&aligned, (unsigned long_long*)saved+j,
sizeof(unsigned long_long));
- hw_ullong = *((unsigned long_long*)&aligned);
+ hw_ullong = (unsigned long_long)(*((unsigned long_long*)
+ &aligned));
break;
case INT_OTHER:
break;
@@ -2432,7 +2444,9 @@ test_conv_flt_1 (const char *name, hid_t src, hid_t dst)
dst_size = H5Tget_size(dst);
buf = aligned_malloc(nelmts*MAX(src_size, dst_size));
saved = aligned_malloc(nelmts*MAX(src_size, dst_size));
+#ifdef SHOW_OVERFLOWS
noverflows_g = 0;
+#endif
for (i=0; i<ntests; i++) {
diff --git a/test/enum.c b/test/enum.c
index e7e08b9..71fc4bf 100644
--- a/test/enum.c
+++ b/test/enum.c
@@ -191,7 +191,8 @@ test_tr1(hid_t file)
{
hid_t cwg=-1, m_type=-1, f_type=-1, space=-1, dset=-1;
hsize_t i, ds_size[1]={10};
- c_e1 val;
+ c_e1 eval;
+ int ival;
static c_e1 data1[10]={E1_RED, E1_GREEN, E1_BLUE, E1_GREEN, E1_WHITE,
E1_WHITE, E1_BLACK, E1_GREEN, E1_BLUE, E1_RED};
c_e1 data2[10];
@@ -200,18 +201,19 @@ test_tr1(hid_t file)
if ((cwg=H5Gcreate(file, "test_tr1", 0))<0) goto error;
if ((m_type = H5Tcreate(H5T_ENUM, sizeof(c_e1)))<0) goto error;
- if (H5Tenum_insert(m_type, "RED", CPTR(val, E1_RED ))<0) goto error;
- if (H5Tenum_insert(m_type, "GREEN", CPTR(val, E1_GREEN))<0) goto error;
- if (H5Tenum_insert(m_type, "BLUE", CPTR(val, E1_BLUE ))<0) goto error;
- if (H5Tenum_insert(m_type, "WHITE", CPTR(val, E1_WHITE))<0) goto error;
- if (H5Tenum_insert(m_type, "BLACK", CPTR(val, E1_BLACK))<0) goto error;
+ if (H5Tenum_insert(m_type, "RED", CPTR(eval, E1_RED ))<0) goto error;
+ if (H5Tenum_insert(m_type, "GREEN", CPTR(eval, E1_GREEN))<0) goto error;
+ if (H5Tenum_insert(m_type, "BLUE", CPTR(eval, E1_BLUE ))<0) goto error;
+ if (H5Tenum_insert(m_type, "WHITE", CPTR(eval, E1_WHITE))<0) goto error;
+ if (H5Tenum_insert(m_type, "BLACK", CPTR(eval, E1_BLACK))<0) goto error;
+ assert(sizeof(c_e1)==sizeof(int));
if ((f_type = H5Tcreate(H5T_ENUM, sizeof(c_e1)))<0) goto error;
- if (H5Tenum_insert(f_type, "RED", CPTR(val, 105))<0) goto error;
- if (H5Tenum_insert(f_type, "GREEN", CPTR(val, 104))<0) goto error;
- if (H5Tenum_insert(f_type, "BLUE", CPTR(val, 103))<0) goto error;
- if (H5Tenum_insert(f_type, "WHITE", CPTR(val, 102))<0) goto error;
- if (H5Tenum_insert(f_type, "BLACK", CPTR(val, 101))<0) goto error;
+ if (H5Tenum_insert(f_type, "RED", CPTR(ival, 105))<0) goto error;
+ if (H5Tenum_insert(f_type, "GREEN", CPTR(ival, 104))<0) goto error;
+ if (H5Tenum_insert(f_type, "BLUE", CPTR(ival, 103))<0) goto error;
+ if (H5Tenum_insert(f_type, "WHITE", CPTR(ival, 102))<0) goto error;
+ if (H5Tenum_insert(f_type, "BLACK", CPTR(ival, 101))<0) goto error;
if ((space=H5Screate_simple(1, ds_size, NULL))<0) goto error;
if ((dset=H5Dcreate(cwg, "color_table", f_type, space, H5P_DEFAULT))<0)
diff --git a/test/mtime.c b/test/mtime.c
index e615a85..6cf50fe 100644
--- a/test/mtime.c
+++ b/test/mtime.c
@@ -95,9 +95,9 @@ main(void)
} else if (fabs(HDdifftime(now, sb1.mtime))>60.0) {
FAILED();
tm = localtime(&(sb1.mtime));
- strftime(buf1, sizeof buf1, "%Y-%m-%d %H:%M:%S", tm);
+ strftime((char*)buf1, sizeof buf1, "%Y-%m-%d %H:%M:%S", tm);
tm = localtime(&now);
- strftime(buf2, sizeof buf2, "%Y-%m-%d %H:%M:%S", tm);
+ strftime((char*)buf2, sizeof buf2, "%Y-%m-%d %H:%M:%S", tm);
printf(" got: %s\n ans: %s\n", buf1, buf2);
return 1;
}
diff --git a/test/ohdr.c b/test/ohdr.c
index ec6c3b1..32b97bb 100644
--- a/test/ohdr.c
+++ b/test/ohdr.c
@@ -44,7 +44,7 @@ main(void)
H5F_t *f=NULL;
char filename[1024];
H5G_entry_t oh_ent;
- H5O_stab_t stab, ro, *ptr=NULL;
+ H5O_stab_t stab, ro;
int i;
/* Reset library */
@@ -83,7 +83,7 @@ main(void)
H5Eprint(stdout);
goto error;
}
- if (NULL==(ptr=H5O_read(&oh_ent, H5O_STAB, 0, &ro))) {
+ if (NULL==H5O_read(&oh_ent, H5O_STAB, 0, &ro)) {
FAILED();
H5Eprint(stdout);
goto error;
@@ -115,7 +115,7 @@ main(void)
H5Eprint(stdout);
goto error;
}
- if (NULL==(ptr=H5O_read(&oh_ent, H5O_STAB, 0, &ro))) {
+ if (NULL==H5O_read(&oh_ent, H5O_STAB, 0, &ro)) {
FAILED();
H5Eprint(stdout);
goto error;
@@ -148,7 +148,7 @@ main(void)
H5Eprint(stdout);
goto error;
}
- if (NULL==(ptr=H5O_read(&oh_ent, H5O_STAB, 1, &ro))) {
+ if (NULL==H5O_read(&oh_ent, H5O_STAB, 1, &ro)) {
FAILED();
H5Eprint(stdout);
goto error;
@@ -180,7 +180,7 @@ main(void)
H5Eprint(stdout);
goto error;
}
- if (NULL==(ptr=H5O_read(&oh_ent, H5O_STAB, 1, &ro))) {
+ if (NULL==H5O_read(&oh_ent, H5O_STAB, 1, &ro)) {
FAILED();
H5Eprint(stdout);
goto error;