mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-04-12 17:31:09 +08:00
[svn-r1101] Changes since 19990219
---------------------- ./config/irix64 The old (-32) compiler is now supported by setting envrionment CC='cc -32'. The -64 compiler is the default or you can set CC='cc -64'. ./src/H5A.c ./src/H5D.c ./src/H5F.c ./src/H5Fistore.c ./src/H5Flow.c ./src/H5G.c ./src/H5I.c ./src/H5Ocomp.c ./src/H5P.c ./src/H5R.c ./src/H5RA.c ./src/H5T.c ./src/H5Tbit.c ./src/H5Tconv.c ./src/H5Z.c ./src/H5detect.c ./test/big.c ./test/cmpd_dset.c ./test/dsets.c ./test/dtypes.c ./test/enum.c ./test/mtime.c ./test/ohdr.c ./tools/h5ls.c Fixed lots of warnings on Irix64. Mailed a few remaining warnings in H5S to Quincey and a few in the dumper to Ruey-Hsia.
This commit is contained in:
Robb Matzke
parent
d8b07ce1d0
commit
17535fbc17
2
README
2
README
@ -1,4 +1,4 @@
|
||||
This is hdf5-1.1.50 released on Thu Feb 25 04:18:56 CST 1999
|
||||
This is hdf5-1.1.51 released on Thu Feb 25 10:21:23 CST 1999
|
||||
Please refer to the INSTALL file for installation instructions.
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
# Use SGI supplied C compiler by default. There is no ranlib
|
||||
if test "X-" = "X-$CC"; then
|
||||
CC=cc
|
||||
CC='cc -64'
|
||||
CC_BASENAME=cc
|
||||
fi
|
||||
RANLIB=:
|
||||
@ -26,18 +26,36 @@ case "X-$CC_BASENAME" in
|
||||
;;
|
||||
|
||||
*)
|
||||
# Always turn off these compiler warnings:
|
||||
CFLAGS="$CFLAGS -ansi"
|
||||
|
||||
# Always turn off these compiler warnings for the -64 compiler:
|
||||
# 1174: function declared but not used
|
||||
# 1429: the `long long' type is not standard
|
||||
# 1209: constant expressions
|
||||
# 1196: __vfork() (this is an SGI config problem)
|
||||
# 1685: turn off warnings about turning off invalid warnings
|
||||
CFLAGS="$CFLAGS -woff 1174,1429,1209,1196,1685"
|
||||
|
||||
# Always turn off these compiler warnings for the old compiler:
|
||||
# 799: the `long long' type is not standard
|
||||
# 803: turn off warnings about turning off invalid warnings
|
||||
# 835: __vfork() (this is an SGI config problem)
|
||||
CFLAGS="$CFLAGS -woff 799,803,835"
|
||||
|
||||
# Always turn off these loader warnings:
|
||||
# 47: branch instructions that degrade performance on R4000
|
||||
# 84: a library is not used
|
||||
CFLAGS="$CFLAGS -ansi -64 -woff 1174,1429,1209,1196 -Wl,-woff,84"
|
||||
CFLAGS="$CFLAGS -Wl,-woff,47,84"
|
||||
|
||||
# Extra debugging flags
|
||||
DEBUG_CFLAGS="-g -fullwarn"
|
||||
DEBUG_CPPFLAGS=
|
||||
|
||||
# Extra production flags
|
||||
PROD_CFLAGS=-O
|
||||
PROD_CPPFLAGS=
|
||||
|
||||
# Extra profiling flags
|
||||
PROFILE_CFLAGS=-pg
|
||||
PROFILE_CPPFLAGS=
|
||||
;;
|
||||
|
||||
416
src/.distdep
416
src/.distdep
@ -135,38 +135,6 @@ H5E.o: \
|
||||
H5config.h \
|
||||
H5api_adpt.h \
|
||||
H5Iprivate.h
|
||||
H5F.o: \
|
||||
H5F.c \
|
||||
H5private.h \
|
||||
H5public.h \
|
||||
H5config.h \
|
||||
H5api_adpt.h \
|
||||
H5Aprivate.h \
|
||||
H5Apublic.h \
|
||||
H5Ipublic.h \
|
||||
H5Gprivate.h \
|
||||
H5Gpublic.h \
|
||||
H5Bprivate.h \
|
||||
H5Bpublic.h \
|
||||
H5Fprivate.h \
|
||||
H5Fpublic.h \
|
||||
H5Dpublic.h \
|
||||
H5Dprivate.h \
|
||||
H5Oprivate.h \
|
||||
H5Opublic.h \
|
||||
H5HGprivate.h \
|
||||
H5HGpublic.h \
|
||||
H5Tprivate.h \
|
||||
H5Tpublic.h \
|
||||
H5Sprivate.h \
|
||||
H5Spublic.h \
|
||||
H5Zprivate.h \
|
||||
H5Zpublic.h \
|
||||
H5Iprivate.h \
|
||||
H5ACprivate.h \
|
||||
H5ACpublic.h \
|
||||
H5Eprivate.h \
|
||||
H5Epublic.h
|
||||
H5Farray.o: \
|
||||
H5Farray.c \
|
||||
H5private.h \
|
||||
@ -245,18 +213,6 @@ H5Fistore.o: \
|
||||
H5Zpublic.h \
|
||||
H5Eprivate.h \
|
||||
H5Epublic.h
|
||||
H5Flow.o: \
|
||||
H5Flow.c \
|
||||
H5private.h \
|
||||
H5public.h \
|
||||
H5config.h \
|
||||
H5api_adpt.h \
|
||||
H5Eprivate.h \
|
||||
H5Epublic.h \
|
||||
H5Ipublic.h \
|
||||
H5Fprivate.h \
|
||||
H5Fpublic.h \
|
||||
H5Dpublic.h
|
||||
H5Fmpio.o: \
|
||||
H5Fmpio.c \
|
||||
H5private.h \
|
||||
@ -320,43 +276,6 @@ H5Fstdio.o: \
|
||||
H5Fprivate.h \
|
||||
H5Fpublic.h \
|
||||
H5Dpublic.h
|
||||
H5G.o: \
|
||||
H5G.c \
|
||||
H5private.h \
|
||||
H5public.h \
|
||||
H5config.h \
|
||||
H5api_adpt.h \
|
||||
H5Aprivate.h \
|
||||
H5Apublic.h \
|
||||
H5Ipublic.h \
|
||||
H5Gprivate.h \
|
||||
H5Gpublic.h \
|
||||
H5Bprivate.h \
|
||||
H5Bpublic.h \
|
||||
H5Fprivate.h \
|
||||
H5Fpublic.h \
|
||||
H5Dpublic.h \
|
||||
H5Dprivate.h \
|
||||
H5Oprivate.h \
|
||||
H5Opublic.h \
|
||||
H5HGprivate.h \
|
||||
H5HGpublic.h \
|
||||
H5Tprivate.h \
|
||||
H5Tpublic.h \
|
||||
H5Sprivate.h \
|
||||
H5Spublic.h \
|
||||
H5Zprivate.h \
|
||||
H5Zpublic.h \
|
||||
H5Eprivate.h \
|
||||
H5Epublic.h \
|
||||
H5Gpkg.h \
|
||||
H5ACprivate.h \
|
||||
H5ACpublic.h \
|
||||
H5HLprivate.h \
|
||||
H5HLpublic.h \
|
||||
H5Iprivate.h \
|
||||
H5MMprivate.h \
|
||||
H5MMpublic.h
|
||||
H5Gent.o: \
|
||||
H5Gent.c \
|
||||
H5private.h \
|
||||
@ -935,38 +854,6 @@ H5R.o: \
|
||||
H5Zprivate.h \
|
||||
H5Zpublic.h \
|
||||
H5Eprivate.h
|
||||
H5RA.o: \
|
||||
H5RA.c \
|
||||
H5RAprivate.h \
|
||||
H5RApublic.h \
|
||||
H5Ipublic.h \
|
||||
H5public.h \
|
||||
H5config.h \
|
||||
H5api_adpt.h \
|
||||
H5Dprivate.h \
|
||||
H5Dpublic.h \
|
||||
H5private.h \
|
||||
H5Fprivate.h \
|
||||
H5Fpublic.h \
|
||||
H5Gprivate.h \
|
||||
H5Gpublic.h \
|
||||
H5Bprivate.h \
|
||||
H5Bpublic.h \
|
||||
H5Oprivate.h \
|
||||
H5Opublic.h \
|
||||
H5HGprivate.h \
|
||||
H5HGpublic.h \
|
||||
H5Tprivate.h \
|
||||
H5Tpublic.h \
|
||||
H5Sprivate.h \
|
||||
H5Spublic.h \
|
||||
H5Zprivate.h \
|
||||
H5Zpublic.h \
|
||||
H5Eprivate.h \
|
||||
H5Epublic.h \
|
||||
H5Iprivate.h \
|
||||
H5MMprivate.h \
|
||||
H5MMpublic.h
|
||||
H5S.o: \
|
||||
H5S.c \
|
||||
H5private.h \
|
||||
@ -1021,33 +908,6 @@ H5Sall.o: \
|
||||
H5Zprivate.h \
|
||||
H5Zpublic.h \
|
||||
H5Vprivate.h
|
||||
H5Shyper.o: \
|
||||
H5Shyper.c \
|
||||
H5private.h \
|
||||
H5public.h \
|
||||
H5config.h \
|
||||
H5api_adpt.h \
|
||||
H5Eprivate.h \
|
||||
H5Epublic.h \
|
||||
H5Ipublic.h \
|
||||
H5Sprivate.h \
|
||||
H5Spublic.h \
|
||||
H5Fprivate.h \
|
||||
H5Fpublic.h \
|
||||
H5Dpublic.h \
|
||||
H5Gprivate.h \
|
||||
H5Gpublic.h \
|
||||
H5Bprivate.h \
|
||||
H5Bpublic.h \
|
||||
H5Oprivate.h \
|
||||
H5Opublic.h \
|
||||
H5HGprivate.h \
|
||||
H5HGpublic.h \
|
||||
H5Tprivate.h \
|
||||
H5Tpublic.h \
|
||||
H5Zprivate.h \
|
||||
H5Zpublic.h \
|
||||
H5Vprivate.h
|
||||
H5Smpio.o: \
|
||||
H5Smpio.c \
|
||||
H5private.h \
|
||||
@ -1183,74 +1043,6 @@ H5T.o: \
|
||||
H5MMpublic.h \
|
||||
H5Tpkg.h \
|
||||
H5Rprivate.h
|
||||
H5Tbit.o: \
|
||||
H5Tbit.c \
|
||||
H5private.h \
|
||||
H5public.h \
|
||||
H5config.h \
|
||||
H5api_adpt.h \
|
||||
H5Eprivate.h \
|
||||
H5Epublic.h \
|
||||
H5Ipublic.h \
|
||||
H5Iprivate.h \
|
||||
H5Tpkg.h \
|
||||
H5HGprivate.h \
|
||||
H5HGpublic.h \
|
||||
H5Fprivate.h \
|
||||
H5Fpublic.h \
|
||||
H5Dpublic.h \
|
||||
H5Rprivate.h \
|
||||
H5Rpublic.h \
|
||||
H5Tprivate.h \
|
||||
H5Tpublic.h \
|
||||
H5Gprivate.h \
|
||||
H5Gpublic.h
|
||||
H5Tconv.o: \
|
||||
H5Tconv.c \
|
||||
H5Iprivate.h \
|
||||
H5Ipublic.h \
|
||||
H5public.h \
|
||||
H5config.h \
|
||||
H5api_adpt.h \
|
||||
H5private.h \
|
||||
H5Eprivate.h \
|
||||
H5Epublic.h \
|
||||
H5MMprivate.h \
|
||||
H5MMpublic.h \
|
||||
H5Tpkg.h \
|
||||
H5HGprivate.h \
|
||||
H5HGpublic.h \
|
||||
H5Fprivate.h \
|
||||
H5Fpublic.h \
|
||||
H5Dpublic.h \
|
||||
H5Rprivate.h \
|
||||
H5Rpublic.h \
|
||||
H5Tprivate.h \
|
||||
H5Tpublic.h \
|
||||
H5Gprivate.h \
|
||||
H5Gpublic.h
|
||||
H5Tinit.o: \
|
||||
H5Tinit.c \
|
||||
H5private.h \
|
||||
H5public.h \
|
||||
H5config.h \
|
||||
H5api_adpt.h \
|
||||
H5Iprivate.h \
|
||||
H5Ipublic.h \
|
||||
H5Eprivate.h \
|
||||
H5Epublic.h \
|
||||
H5MMprivate.h \
|
||||
H5MMpublic.h \
|
||||
H5Tpkg.h \
|
||||
H5HGprivate.h \
|
||||
H5HGpublic.h \
|
||||
H5Fprivate.h \
|
||||
H5Fpublic.h \
|
||||
H5Dpublic.h \
|
||||
H5Rprivate.h \
|
||||
H5Rpublic.h \
|
||||
H5Tprivate.h \
|
||||
H5Tpublic.h
|
||||
H5TB.o: \
|
||||
H5TB.c \
|
||||
H5private.h \
|
||||
@ -1285,6 +1077,214 @@ H5V.o: \
|
||||
H5HGpublic.h \
|
||||
H5Tprivate.h \
|
||||
H5Tpublic.h
|
||||
H5RA.o: \
|
||||
H5RA.c \
|
||||
H5RAprivate.h \
|
||||
H5RApublic.h \
|
||||
H5Ipublic.h \
|
||||
H5public.h \
|
||||
H5config.h \
|
||||
H5api_adpt.h \
|
||||
H5Dprivate.h \
|
||||
H5Dpublic.h \
|
||||
H5private.h \
|
||||
H5Fprivate.h \
|
||||
H5Fpublic.h \
|
||||
H5Gprivate.h \
|
||||
H5Gpublic.h \
|
||||
H5Bprivate.h \
|
||||
H5Bpublic.h \
|
||||
H5Oprivate.h \
|
||||
H5Opublic.h \
|
||||
H5HGprivate.h \
|
||||
H5HGpublic.h \
|
||||
H5Tprivate.h \
|
||||
H5Tpublic.h \
|
||||
H5Sprivate.h \
|
||||
H5Spublic.h \
|
||||
H5Zprivate.h \
|
||||
H5Zpublic.h \
|
||||
H5Eprivate.h \
|
||||
H5Epublic.h \
|
||||
H5Iprivate.h \
|
||||
H5MMprivate.h \
|
||||
H5MMpublic.h
|
||||
H5Shyper.o: \
|
||||
H5Shyper.c \
|
||||
H5private.h \
|
||||
H5public.h \
|
||||
H5config.h \
|
||||
H5api_adpt.h \
|
||||
H5Eprivate.h \
|
||||
H5Epublic.h \
|
||||
H5Ipublic.h \
|
||||
H5Sprivate.h \
|
||||
H5Spublic.h \
|
||||
H5Fprivate.h \
|
||||
H5Fpublic.h \
|
||||
H5Dpublic.h \
|
||||
H5Gprivate.h \
|
||||
H5Gpublic.h \
|
||||
H5Bprivate.h \
|
||||
H5Bpublic.h \
|
||||
H5Oprivate.h \
|
||||
H5Opublic.h \
|
||||
H5HGprivate.h \
|
||||
H5HGpublic.h \
|
||||
H5Tprivate.h \
|
||||
H5Tpublic.h \
|
||||
H5Zprivate.h \
|
||||
H5Zpublic.h \
|
||||
H5Vprivate.h
|
||||
H5F.o: \
|
||||
H5F.c \
|
||||
H5private.h \
|
||||
H5public.h \
|
||||
H5config.h \
|
||||
H5api_adpt.h \
|
||||
H5Aprivate.h \
|
||||
H5Apublic.h \
|
||||
H5Ipublic.h \
|
||||
H5Gprivate.h \
|
||||
H5Gpublic.h \
|
||||
H5Bprivate.h \
|
||||
H5Bpublic.h \
|
||||
H5Fprivate.h \
|
||||
H5Fpublic.h \
|
||||
H5Dpublic.h \
|
||||
H5Dprivate.h \
|
||||
H5Oprivate.h \
|
||||
H5Opublic.h \
|
||||
H5HGprivate.h \
|
||||
H5HGpublic.h \
|
||||
H5Tprivate.h \
|
||||
H5Tpublic.h \
|
||||
H5Sprivate.h \
|
||||
H5Spublic.h \
|
||||
H5Zprivate.h \
|
||||
H5Zpublic.h \
|
||||
H5Iprivate.h \
|
||||
H5ACprivate.h \
|
||||
H5ACpublic.h \
|
||||
H5Eprivate.h \
|
||||
H5Epublic.h
|
||||
H5Tconv.o: \
|
||||
H5Tconv.c \
|
||||
H5Iprivate.h \
|
||||
H5Ipublic.h \
|
||||
H5public.h \
|
||||
H5config.h \
|
||||
H5api_adpt.h \
|
||||
H5private.h \
|
||||
H5Eprivate.h \
|
||||
H5Epublic.h \
|
||||
H5MMprivate.h \
|
||||
H5MMpublic.h \
|
||||
H5Tpkg.h \
|
||||
H5HGprivate.h \
|
||||
H5HGpublic.h \
|
||||
H5Fprivate.h \
|
||||
H5Fpublic.h \
|
||||
H5Dpublic.h \
|
||||
H5Rprivate.h \
|
||||
H5Rpublic.h \
|
||||
H5Tprivate.h \
|
||||
H5Tpublic.h \
|
||||
H5Gprivate.h \
|
||||
H5Gpublic.h
|
||||
H5Flow.o: \
|
||||
H5Flow.c \
|
||||
H5private.h \
|
||||
H5public.h \
|
||||
H5config.h \
|
||||
H5api_adpt.h \
|
||||
H5Eprivate.h \
|
||||
H5Epublic.h \
|
||||
H5Ipublic.h \
|
||||
H5Fprivate.h \
|
||||
H5Fpublic.h \
|
||||
H5Dpublic.h
|
||||
H5G.o: \
|
||||
H5G.c \
|
||||
H5private.h \
|
||||
H5public.h \
|
||||
H5config.h \
|
||||
H5api_adpt.h \
|
||||
H5Aprivate.h \
|
||||
H5Apublic.h \
|
||||
H5Ipublic.h \
|
||||
H5Gprivate.h \
|
||||
H5Gpublic.h \
|
||||
H5Bprivate.h \
|
||||
H5Bpublic.h \
|
||||
H5Fprivate.h \
|
||||
H5Fpublic.h \
|
||||
H5Dpublic.h \
|
||||
H5Dprivate.h \
|
||||
H5Oprivate.h \
|
||||
H5Opublic.h \
|
||||
H5HGprivate.h \
|
||||
H5HGpublic.h \
|
||||
H5Tprivate.h \
|
||||
H5Tpublic.h \
|
||||
H5Sprivate.h \
|
||||
H5Spublic.h \
|
||||
H5Zprivate.h \
|
||||
H5Zpublic.h \
|
||||
H5Eprivate.h \
|
||||
H5Epublic.h \
|
||||
H5Gpkg.h \
|
||||
H5ACprivate.h \
|
||||
H5ACpublic.h \
|
||||
H5HLprivate.h \
|
||||
H5HLpublic.h \
|
||||
H5Iprivate.h \
|
||||
H5MMprivate.h \
|
||||
H5MMpublic.h
|
||||
H5Tbit.o: \
|
||||
H5Tbit.c \
|
||||
H5private.h \
|
||||
H5public.h \
|
||||
H5config.h \
|
||||
H5api_adpt.h \
|
||||
H5Eprivate.h \
|
||||
H5Epublic.h \
|
||||
H5Ipublic.h \
|
||||
H5Iprivate.h \
|
||||
H5Tpkg.h \
|
||||
H5HGprivate.h \
|
||||
H5HGpublic.h \
|
||||
H5Fprivate.h \
|
||||
H5Fpublic.h \
|
||||
H5Dpublic.h \
|
||||
H5Rprivate.h \
|
||||
H5Rpublic.h \
|
||||
H5Tprivate.h \
|
||||
H5Tpublic.h \
|
||||
H5Gprivate.h \
|
||||
H5Gpublic.h
|
||||
H5Tinit.o: \
|
||||
H5Tinit.c \
|
||||
H5private.h \
|
||||
H5public.h \
|
||||
H5config.h \
|
||||
H5api_adpt.h \
|
||||
H5Iprivate.h \
|
||||
H5Ipublic.h \
|
||||
H5Eprivate.h \
|
||||
H5Epublic.h \
|
||||
H5MMprivate.h \
|
||||
H5MMpublic.h \
|
||||
H5Tpkg.h \
|
||||
H5HGprivate.h \
|
||||
H5HGpublic.h \
|
||||
H5Fprivate.h \
|
||||
H5Fpublic.h \
|
||||
H5Dpublic.h \
|
||||
H5Rprivate.h \
|
||||
H5Rpublic.h \
|
||||
H5Tprivate.h \
|
||||
H5Tpublic.h
|
||||
H5Z.o: \
|
||||
H5Z.c \
|
||||
H5private.h \
|
||||
|
||||
@ -990,7 +990,7 @@ H5Aget_name(hid_t attr_id, size_t buf_size, char *buf)
|
||||
}
|
||||
|
||||
/* get the real attribute length */
|
||||
ret_value=HDstrlen(attr->name);
|
||||
ret_value=(hssize_t)HDstrlen(attr->name);
|
||||
|
||||
/* compute the string length which will fit into the user's buffer */
|
||||
copy_len=MIN(buf_size-1,ret_value);
|
||||
|
||||
@ -2324,7 +2324,7 @@ H5D_init_storage(H5D_t *dset, const H5S_t *space)
|
||||
{
|
||||
intn ndims;
|
||||
hsize_t dim[H5O_LAYOUT_NDIMS];
|
||||
hssize_t npoints, ptsperbuf;
|
||||
hssize_t npoints, ptsperbuf;
|
||||
size_t size, bufsize=8*1024;
|
||||
hid_t buf_id = -1;
|
||||
haddr_t addr;
|
||||
@ -2350,7 +2350,8 @@ H5D_init_storage(H5D_t *dset, const H5S_t *space)
|
||||
* this quite efficiently by making sure we copy the fill value
|
||||
* in relatively large pieces.
|
||||
*/
|
||||
ptsperbuf = MAX(1, bufsize/dset->create_parms->fill.size);
|
||||
ptsperbuf = (hssize_t)MAX(1,
|
||||
bufsize/dset->create_parms->fill.size);
|
||||
bufsize = ptsperbuf * dset->create_parms->fill.size;
|
||||
if ((buf_id=H5TB_get_buf(bufsize, TRUE, &buf))<0) {
|
||||
HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL,
|
||||
|
||||
@ -1181,7 +1181,8 @@ H5F_istore_lock (H5F_t *f, const H5O_layout_t *layout,
|
||||
assert(split_ratios);
|
||||
|
||||
if (rdcc->nslots>0) {
|
||||
idx = layout->addr.offset;
|
||||
/* We don't care about loss of precision in the following statement. */
|
||||
idx = (uintn)(layout->addr.offset);
|
||||
H5F_MIXUP(idx);
|
||||
for (i=0; i<layout->ndims; i++) {
|
||||
idx += offset[i];
|
||||
|
||||
@ -251,7 +251,7 @@ H5F_term_interface(intn status)
|
||||
static intn
|
||||
H5F_flush_all_cb(H5F_t *f, const void *_invalidate)
|
||||
{
|
||||
hbool_t invalidate = (hbool_t)_invalidate;
|
||||
hbool_t invalidate = *((const hbool_t*)_invalidate);
|
||||
H5F_flush(f, H5F_SCOPE_LOCAL, invalidate);
|
||||
return 0;
|
||||
}
|
||||
@ -279,7 +279,7 @@ H5F_flush_all(hbool_t invalidate)
|
||||
{
|
||||
FUNC_ENTER(H5F_flush_all, FAIL);
|
||||
H5I_search(H5I_FILE, (H5I_search_func_t)H5F_flush_all_cb,
|
||||
(void*)invalidate);
|
||||
(void*)&invalidate);
|
||||
FUNC_LEAVE(SUCCEED);
|
||||
}
|
||||
|
||||
|
||||
@ -1181,7 +1181,8 @@ H5F_istore_lock (H5F_t *f, const H5O_layout_t *layout,
|
||||
assert(split_ratios);
|
||||
|
||||
if (rdcc->nslots>0) {
|
||||
idx = layout->addr.offset;
|
||||
/* We don't care about loss of precision in the following statement. */
|
||||
idx = (uintn)(layout->addr.offset);
|
||||
H5F_MIXUP(idx);
|
||||
for (i=0; i<layout->ndims; i++) {
|
||||
idx += offset[i];
|
||||
|
||||
@ -1033,8 +1033,10 @@ H5F_addr_pack(H5F_t __unused__ *f, haddr_t *addr, const unsigned long objno[2])
|
||||
assert(objno);
|
||||
assert(addr);
|
||||
|
||||
addr->offset=objno[0];
|
||||
addr->offset|=((uint64_t)objno[1])<<(8*sizeof(long));
|
||||
addr->offset = objno[0];
|
||||
#if SIZEOF_LONG<SIZEOF_UINT64_T
|
||||
addr->offset |= ((uint64_t)objno[1]) << (8*sizeof(long));
|
||||
#endif
|
||||
|
||||
return(SUCCEED);
|
||||
}
|
||||
|
||||
14
src/H5G.c
14
src/H5G.c
@ -873,14 +873,13 @@ H5G_component(const char *name, size_t *size_p)
|
||||
static const char *
|
||||
H5G_basename(const char *name, size_t *size_p)
|
||||
{
|
||||
size_t i, end;
|
||||
size_t i;
|
||||
|
||||
FUNC_ENTER(H5G_basename, NULL);
|
||||
|
||||
/* Find the end of the base name */
|
||||
i = strlen(name);
|
||||
while (i>0 && '/'==name[i-1]) --i;
|
||||
end = i;
|
||||
|
||||
/* Skip backward over base name */
|
||||
while (i>0 && '/'!=name[i-1]) --i;
|
||||
@ -1770,6 +1769,7 @@ H5G_loc (hid_t loc_id)
|
||||
case H5I_NGROUPS:
|
||||
case H5I_BADID:
|
||||
case H5I_FILE_CLOSING:
|
||||
case H5I_REFERENCE:
|
||||
HRETURN_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "invalid object ID");
|
||||
}
|
||||
|
||||
@ -2005,10 +2005,12 @@ H5G_get_objinfo (H5G_entry_t *loc, const char *name, hbool_t follow_link,
|
||||
} else {
|
||||
/* Some other type of object */
|
||||
statbuf->objno[0] = (unsigned long)(obj_ent.header.offset);
|
||||
if (sizeof(obj_ent.header.offset)>sizeof(long)) {
|
||||
statbuf->objno[1] = (unsigned long)(obj_ent.header.offset >>
|
||||
8*sizeof(long));
|
||||
}
|
||||
#if SIZEOF_UINT64_T>SIZEOF_LONG
|
||||
statbuf->objno[1] = (unsigned long)(obj_ent.header.offset >>
|
||||
8*sizeof(long));
|
||||
#else
|
||||
statbuf->objno[1] = 0;
|
||||
#endif
|
||||
statbuf->nlink = H5O_link (&obj_ent, 0);
|
||||
statbuf->type = H5G_LINK;
|
||||
if (NULL==H5O_read(&obj_ent, H5O_MTIME, 0, &(statbuf->mtime))) {
|
||||
|
||||
@ -170,7 +170,7 @@ H5I_term_interface(intn status)
|
||||
H5I_type_t grp;
|
||||
|
||||
if (interface_initialize_g>0) {
|
||||
for (grp=0; grp<H5I_NGROUPS; grp++) {
|
||||
for (grp=(H5I_type_t)0; grp<H5I_NGROUPS; grp++) {
|
||||
/*
|
||||
* Destroy each group regardless of reference count. This removes
|
||||
* any objects which might still be defined in the group. Then
|
||||
|
||||
@ -179,7 +179,7 @@ H5O_pline_encode (H5F_t __unused__ *f, uint8_t *p/*out*/, const void *mesg)
|
||||
assert (mesg);
|
||||
|
||||
*p++ = H5O_PLINE_VERSION;
|
||||
*p++ = pline->nfilters;
|
||||
*p++ = (uint8_t)(pline->nfilters);
|
||||
*p++ = 0; /*reserved 1*/
|
||||
*p++ = 0; /*reserved 2*/
|
||||
*p++ = 0; /*reserved 3*/
|
||||
|
||||
@ -2316,7 +2316,7 @@ H5Pget_nfilters(hid_t plist_id)
|
||||
"not a dataset creation property list");
|
||||
}
|
||||
|
||||
FUNC_LEAVE(plist->pline.nfilters);
|
||||
FUNC_LEAVE((int)(plist->pline.nfilters));
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -483,7 +483,7 @@ done:
|
||||
REVISION LOG
|
||||
--------------------------------------------------------------------------*/
|
||||
static H5S_t *
|
||||
H5R_get_region(H5D_t *dset, H5R_type_t ref_type, void *_ref)
|
||||
H5R_get_region(H5D_t *dset, H5R_type_t __unused__ ref_type, void *_ref)
|
||||
{
|
||||
H5D_t *dataset; /* Pointer to dataset to open */
|
||||
H5G_entry_t ent; /* Symbol table entry */
|
||||
|
||||
@ -543,14 +543,12 @@ H5RA_open(H5G_entry_t *loc, const char *name)
|
||||
herr_t
|
||||
H5RAclose(hid_t array_id)
|
||||
{
|
||||
H5RA_t *ra=NULL;
|
||||
|
||||
FUNC_ENTER(H5RAclose, FAIL);
|
||||
H5TRACE1("e","i",array_id);
|
||||
|
||||
/* Check args */
|
||||
if (H5I_RAGGED!=H5I_get_type(array_id) ||
|
||||
NULL==(ra=H5I_object(array_id))) {
|
||||
NULL==H5I_object(array_id)) {
|
||||
HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a ragged array");
|
||||
}
|
||||
|
||||
|
||||
@ -6221,7 +6221,7 @@ H5T_entof (H5T_t *dt)
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
static herr_t
|
||||
H5T_print_stats(H5T_path_t __unused__ *path, intn *nprint/*in,out*/)
|
||||
H5T_print_stats(H5T_path_t __unused__ *path, intn __unused__ *nprint/*in,out*/)
|
||||
{
|
||||
#ifdef H5T_DEBUG
|
||||
hsize_t nbytes;
|
||||
@ -6449,8 +6449,8 @@ H5T_debug(H5T_t *dt, FILE *stream)
|
||||
for (i=0; i<dt->u.enumer.nmembs; i++) {
|
||||
fprintf(stream, "\n\"%s\" = 0x", dt->u.enumer.name[i]);
|
||||
for (k=0; k<base_size; k++) {
|
||||
fprintf(stream, "%02x",
|
||||
(unsigned)(dt->u.enumer.value+i*base_size+k));
|
||||
fprintf(stream, "%02lx",
|
||||
(unsigned long)(dt->u.enumer.value+i*base_size+k));
|
||||
}
|
||||
}
|
||||
fprintf(stream, "\n");
|
||||
|
||||
23
src/H5Tbit.c
23
src/H5Tbit.c
@ -314,6 +314,7 @@ H5T_bit_find (uint8_t *buf, size_t offset, size_t size, H5T_sdir_t direction,
|
||||
{
|
||||
ssize_t base=(ssize_t)offset;
|
||||
ssize_t idx, i;
|
||||
size_t iu;
|
||||
|
||||
/* Some functions call this with value=TRUE */
|
||||
assert (TRUE==1);
|
||||
@ -322,14 +323,14 @@ H5T_bit_find (uint8_t *buf, size_t offset, size_t size, H5T_sdir_t direction,
|
||||
switch (direction) {
|
||||
case H5T_BIT_LSB:
|
||||
/* Calculate index */
|
||||
idx = offset / 8;
|
||||
idx = (ssize_t)(offset / 8);
|
||||
offset %= 8;
|
||||
|
||||
/* Beginning */
|
||||
if (offset) {
|
||||
for (i=offset; i<8 && size>0; i++, size--) {
|
||||
if (value==(hbool_t)((buf[idx]>>i) & 0x01)) {
|
||||
return 8*idx+i - base;
|
||||
for (iu=offset; iu<8 && size>0; iu++, size--) {
|
||||
if (value==(hbool_t)((buf[idx]>>iu) & 0x01)) {
|
||||
return 8*idx+(ssize_t)iu - base;
|
||||
}
|
||||
}
|
||||
offset = 0;
|
||||
@ -357,14 +358,14 @@ H5T_bit_find (uint8_t *buf, size_t offset, size_t size, H5T_sdir_t direction,
|
||||
|
||||
case H5T_BIT_MSB:
|
||||
/* Calculate index */
|
||||
idx = (offset+size-1) / 8;
|
||||
idx = (ssize_t)((offset+size-1) / 8);
|
||||
offset %= 8;
|
||||
|
||||
/* Beginning */
|
||||
if (size>8-offset && (offset+size)%8) {
|
||||
for (i=(offset+size)%8-1; i>=0; --i, --size) {
|
||||
if (value==(hbool_t)((buf[idx]>>i) & 0x01)) {
|
||||
return 8*idx+i - base;
|
||||
for (iu=(offset+size)%8; iu>0; --iu, --size) {
|
||||
if (value==(hbool_t)((buf[idx]>>(iu-1)) & 0x01)) {
|
||||
return 8*idx+(ssize_t)(iu-1) - base;
|
||||
}
|
||||
}
|
||||
--idx;
|
||||
@ -383,9 +384,9 @@ H5T_bit_find (uint8_t *buf, size_t offset, size_t size, H5T_sdir_t direction,
|
||||
}
|
||||
/* End */
|
||||
if (size>0) {
|
||||
for (i=offset+size-1; i>=(ssize_t)offset; --i) {
|
||||
if (value==(hbool_t)((buf[idx]>>i) & 0x01)) {
|
||||
return 8*idx+i - base;
|
||||
for (iu=offset+size; iu>offset; --iu) {
|
||||
if (value==(hbool_t)((buf[idx]>>(iu-1)) & 0x01)) {
|
||||
return 8*idx+(ssize_t)(iu-1) - base;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -126,7 +126,7 @@ static intn interface_initialize_g = 0;
|
||||
#define H5T_CONV_sS(S_ALIGN,D_ALIGN,ST,DT) { \
|
||||
assert(sizeof(ST)<=sizeof(DT)); \
|
||||
CI_BEGIN(S_ALIGN, D_ALIGN, ST, DT, nelmts-1, --) { \
|
||||
*d = *s; \
|
||||
*d = (DT)(*s); \
|
||||
} CI_END; \
|
||||
}
|
||||
|
||||
@ -139,7 +139,7 @@ static intn interface_initialize_g = 0;
|
||||
*d = 0; \
|
||||
} \
|
||||
} else { \
|
||||
*d = *s; \
|
||||
*d = (DT)(*s); \
|
||||
} \
|
||||
} CI_END; \
|
||||
}
|
||||
@ -153,7 +153,7 @@ static intn interface_initialize_g = 0;
|
||||
*d = (D_MAX); \
|
||||
} \
|
||||
} else { \
|
||||
*d = *s; \
|
||||
*d = (DT)(*s); \
|
||||
} \
|
||||
} CI_END; \
|
||||
}
|
||||
@ -161,7 +161,7 @@ static intn interface_initialize_g = 0;
|
||||
#define H5T_CONV_uU(STYPE,DTYPE,ST,DT) { \
|
||||
assert(sizeof(ST)<=sizeof(DT)); \
|
||||
CI_BEGIN(STYPE, DTYPE, ST, DT, nelmts-1, --) { \
|
||||
*d = *s; \
|
||||
*d = (DT)(*s); \
|
||||
} CI_END; \
|
||||
}
|
||||
|
||||
@ -179,7 +179,7 @@ static intn interface_initialize_g = 0;
|
||||
*d = (D_MIN); \
|
||||
} \
|
||||
} else { \
|
||||
*d = *s; \
|
||||
*d = (DT)(*s); \
|
||||
} \
|
||||
} CI_END; \
|
||||
}
|
||||
@ -199,7 +199,7 @@ static intn interface_initialize_g = 0;
|
||||
*d = (D_MAX); \
|
||||
} \
|
||||
} else { \
|
||||
*d = *s; \
|
||||
*d = (DT)(*s); \
|
||||
} \
|
||||
} CI_END; \
|
||||
}
|
||||
@ -213,7 +213,7 @@ static intn interface_initialize_g = 0;
|
||||
*d = (D_MAX); \
|
||||
} \
|
||||
} else { \
|
||||
*d = *s; \
|
||||
*d = (DT)(*s); \
|
||||
} \
|
||||
} CI_END; \
|
||||
}
|
||||
@ -227,7 +227,7 @@ static intn interface_initialize_g = 0;
|
||||
*d = (D_MAX); \
|
||||
} \
|
||||
} else { \
|
||||
*d = *s; \
|
||||
*d = (DT)(*s); \
|
||||
} \
|
||||
} CI_END; \
|
||||
}
|
||||
@ -241,7 +241,7 @@ static intn interface_initialize_g = 0;
|
||||
*d = 0; \
|
||||
} \
|
||||
} else { \
|
||||
*d = *s; \
|
||||
*d = (DT)(*s); \
|
||||
} \
|
||||
} CI_END; \
|
||||
}
|
||||
@ -255,7 +255,7 @@ static intn interface_initialize_g = 0;
|
||||
*d = (D_MAX); \
|
||||
} \
|
||||
} else { \
|
||||
*d = *s; \
|
||||
*d = (DT)(*s); \
|
||||
} \
|
||||
} CI_END; \
|
||||
}
|
||||
@ -1100,12 +1100,12 @@ H5T_conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
|
||||
* Direction of conversion.
|
||||
*/
|
||||
if (dst->size <= src->size) {
|
||||
src_delta = src->size;
|
||||
dst_delta = dst->size;
|
||||
src_delta = (int)src->size; /*overflow shouldn't be possible*/
|
||||
dst_delta = (int)dst->size; /*overflow shouldn't be possible*/
|
||||
s = d = buf;
|
||||
} else {
|
||||
src_delta = -(src->size);
|
||||
dst_delta = -(dst->size);
|
||||
src_delta = -(int)src->size; /*overflow shouldn't be possible*/
|
||||
dst_delta = -(int)dst->size; /*overflow shouldn't be possible*/
|
||||
s = buf + (nelmts-1) * src->size;
|
||||
d = buf + (nelmts-1) * dst->size;
|
||||
}
|
||||
@ -2013,14 +2013,18 @@ H5T_conv_s_s (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
|
||||
direction = 1;
|
||||
olap = 0;
|
||||
} else if (src->size>=dst->size) {
|
||||
double olapd = HDceil((double)(dst->size)/
|
||||
(double)(src->size-dst->size));
|
||||
olap = (size_t)olapd;
|
||||
sp = dp = (uint8_t*)buf;
|
||||
direction = 1;
|
||||
olap = HDceil((double)(dst->size)/(double)(src->size-dst->size));
|
||||
} else {
|
||||
double olapd = HDceil((double)(src->size)/
|
||||
(double)(dst->size-src->size));
|
||||
olap = (size_t)olapd;
|
||||
sp = (uint8_t*)buf + (nelmts-1) * src->size;
|
||||
dp = (uint8_t*)buf + (nelmts-1) * dst->size;
|
||||
direction = -1;
|
||||
olap = HDceil((double)(src->size)/(double)(dst->size-src->size));
|
||||
}
|
||||
|
||||
/* Allocate the overlap buffer */
|
||||
@ -2034,7 +2038,7 @@ H5T_conv_s_s (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
|
||||
|
||||
/*
|
||||
* If the source and destination buffers overlap then use a
|
||||
* temporary buffer fot eh destination.
|
||||
* temporary buffer for the destination.
|
||||
*/
|
||||
if (direction>0) {
|
||||
s = sp;
|
||||
|
||||
@ -501,22 +501,22 @@ H5Z_filter_deflate (uintn flags, size_t cd_nelmts, const uintn cd_values[],
|
||||
size_t nbytes, size_t *buf_size, void **buf)
|
||||
{
|
||||
size_t ret_value = 0;
|
||||
int aggression = 6;
|
||||
void *outbuf = NULL;
|
||||
#if defined(HAVE_COMPRESS2)
|
||||
int aggression = 6;
|
||||
int status;
|
||||
#endif
|
||||
|
||||
FUNC_ENTER (H5Z_filter_deflate, 0);
|
||||
|
||||
/* Get aggression level */
|
||||
/* Check arguments */
|
||||
if (cd_nelmts!=1 || cd_values[0]>9) {
|
||||
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, 0,
|
||||
"invalid deflate aggression level");
|
||||
}
|
||||
aggression = cd_values[0];
|
||||
|
||||
#if defined(HAVE_COMPRESS2)
|
||||
aggression = cd_values[0];
|
||||
if (flags & H5Z_FLAG_REVERSE) {
|
||||
/* Input; uncompress */
|
||||
z_stream z_strm;
|
||||
|
||||
@ -249,6 +249,7 @@ precision (detected_t *d)
|
||||
pid_t _child; \
|
||||
int _status; \
|
||||
\
|
||||
srand((unsigned int)_val); /*suppress "set but unused" warning*/ \
|
||||
for (_ano=0; _ano<NELMTS(align_g); _ano++) { \
|
||||
fflush(stdout); \
|
||||
fflush(stderr); \
|
||||
|
||||
493
test/.distdep
493
test/.distdep
@ -28,38 +28,8 @@ h5test.o: \
|
||||
../src/H5Tpkg.h \
|
||||
../src/H5HGprivate.h \
|
||||
../src/H5Fprivate.h \
|
||||
../src/H5Rprivate.h
|
||||
big.o: \
|
||||
big.c \
|
||||
h5test.h \
|
||||
../src/hdf5.h \
|
||||
../src/H5public.h \
|
||||
../src/H5config.h \
|
||||
../src/H5api_adpt.h \
|
||||
../src/H5Ipublic.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 \
|
||||
../src/H5HLpublic.h \
|
||||
../src/H5MFpublic.h \
|
||||
../src/H5MMpublic.h \
|
||||
../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
|
||||
../src/H5Rprivate.h \
|
||||
../src/H5Tprivate.h
|
||||
bittests.o: \
|
||||
bittests.c \
|
||||
h5test.h \
|
||||
@ -90,7 +60,8 @@ bittests.o: \
|
||||
../src/H5Tpkg.h \
|
||||
../src/H5HGprivate.h \
|
||||
../src/H5Fprivate.h \
|
||||
../src/H5Rprivate.h
|
||||
../src/H5Rprivate.h \
|
||||
../src/H5Tprivate.h
|
||||
chunk.o: \
|
||||
chunk.c \
|
||||
../src/hdf5.h \
|
||||
@ -116,99 +87,6 @@ chunk.o: \
|
||||
../src/H5RApublic.h \
|
||||
../src/H5Spublic.h \
|
||||
../src/H5Tpublic.h
|
||||
cmpd_dset.o: \
|
||||
cmpd_dset.c \
|
||||
h5test.h \
|
||||
../src/hdf5.h \
|
||||
../src/H5public.h \
|
||||
../src/H5config.h \
|
||||
../src/H5api_adpt.h \
|
||||
../src/H5Ipublic.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 \
|
||||
../src/H5HLpublic.h \
|
||||
../src/H5MFpublic.h \
|
||||
../src/H5MMpublic.h \
|
||||
../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
|
||||
dsets.o: \
|
||||
dsets.c \
|
||||
h5test.h \
|
||||
../src/hdf5.h \
|
||||
../src/H5public.h \
|
||||
../src/H5config.h \
|
||||
../src/H5api_adpt.h \
|
||||
../src/H5Ipublic.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 \
|
||||
../src/H5HLpublic.h \
|
||||
../src/H5MFpublic.h \
|
||||
../src/H5MMpublic.h \
|
||||
../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
|
||||
dtypes.o: \
|
||||
dtypes.c \
|
||||
h5test.h \
|
||||
../src/hdf5.h \
|
||||
../src/H5public.h \
|
||||
../src/H5config.h \
|
||||
../src/H5api_adpt.h \
|
||||
../src/H5Ipublic.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 \
|
||||
../src/H5HLpublic.h \
|
||||
../src/H5MFpublic.h \
|
||||
../src/H5MMpublic.h \
|
||||
../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
|
||||
extend.o: \
|
||||
extend.c \
|
||||
h5test.h \
|
||||
@ -239,38 +117,8 @@ extend.o: \
|
||||
../src/H5Tpkg.h \
|
||||
../src/H5HGprivate.h \
|
||||
../src/H5Fprivate.h \
|
||||
../src/H5Rprivate.h
|
||||
external.o: \
|
||||
external.c \
|
||||
h5test.h \
|
||||
../src/hdf5.h \
|
||||
../src/H5public.h \
|
||||
../src/H5config.h \
|
||||
../src/H5api_adpt.h \
|
||||
../src/H5Ipublic.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 \
|
||||
../src/H5HLpublic.h \
|
||||
../src/H5MFpublic.h \
|
||||
../src/H5MMpublic.h \
|
||||
../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
|
||||
../src/H5Rprivate.h \
|
||||
../src/H5Tprivate.h
|
||||
fillval.o: \
|
||||
fillval.c \
|
||||
h5test.h \
|
||||
@ -301,7 +149,8 @@ fillval.o: \
|
||||
../src/H5Tpkg.h \
|
||||
../src/H5HGprivate.h \
|
||||
../src/H5Fprivate.h \
|
||||
../src/H5Rprivate.h
|
||||
../src/H5Rprivate.h \
|
||||
../src/H5Tprivate.h
|
||||
flush1.o: \
|
||||
flush1.c \
|
||||
h5test.h \
|
||||
@ -332,7 +181,8 @@ flush1.o: \
|
||||
../src/H5Tpkg.h \
|
||||
../src/H5HGprivate.h \
|
||||
../src/H5Fprivate.h \
|
||||
../src/H5Rprivate.h
|
||||
../src/H5Rprivate.h \
|
||||
../src/H5Tprivate.h
|
||||
flush2.o: \
|
||||
flush2.c \
|
||||
h5test.h \
|
||||
@ -363,7 +213,8 @@ flush2.o: \
|
||||
../src/H5Tpkg.h \
|
||||
../src/H5HGprivate.h \
|
||||
../src/H5Fprivate.h \
|
||||
../src/H5Rprivate.h
|
||||
../src/H5Rprivate.h \
|
||||
../src/H5Tprivate.h
|
||||
gheap.o: \
|
||||
gheap.c \
|
||||
h5test.h \
|
||||
@ -397,7 +248,8 @@ gheap.o: \
|
||||
../src/H5Rprivate.h \
|
||||
../src/H5Tprivate.h \
|
||||
../src/H5Gprivate.h \
|
||||
../src/H5Bprivate.h
|
||||
../src/H5Bprivate.h \
|
||||
../src/H5Eprivate.h
|
||||
hyperslab.o: \
|
||||
hyperslab.c \
|
||||
../src/H5private.h \
|
||||
@ -468,7 +320,8 @@ istore.o: \
|
||||
../src/H5Sprivate.h \
|
||||
../src/H5Zprivate.h \
|
||||
../src/H5Iprivate.h \
|
||||
../src/H5Pprivate.h
|
||||
../src/H5Pprivate.h \
|
||||
../src/H5MMprivate.h
|
||||
lheap.o: \
|
||||
lheap.c \
|
||||
h5test.h \
|
||||
@ -502,7 +355,8 @@ lheap.o: \
|
||||
../src/H5Rprivate.h \
|
||||
../src/H5Tprivate.h \
|
||||
../src/H5Gprivate.h \
|
||||
../src/H5Bprivate.h
|
||||
../src/H5Bprivate.h \
|
||||
../src/H5HLprivate.h
|
||||
links.o: \
|
||||
links.c \
|
||||
h5test.h \
|
||||
@ -533,7 +387,8 @@ links.o: \
|
||||
../src/H5Tpkg.h \
|
||||
../src/H5HGprivate.h \
|
||||
../src/H5Fprivate.h \
|
||||
../src/H5Rprivate.h
|
||||
../src/H5Rprivate.h \
|
||||
../src/H5Tprivate.h
|
||||
mount.o: \
|
||||
mount.c \
|
||||
h5test.h \
|
||||
@ -564,75 +419,8 @@ mount.o: \
|
||||
../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/H5Ipublic.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 \
|
||||
../src/H5HLpublic.h \
|
||||
../src/H5MFpublic.h \
|
||||
../src/H5MMpublic.h \
|
||||
../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 \
|
||||
h5test.h \
|
||||
../src/hdf5.h \
|
||||
../src/H5public.h \
|
||||
../src/H5config.h \
|
||||
../src/H5api_adpt.h \
|
||||
../src/H5Ipublic.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 \
|
||||
../src/H5HLpublic.h \
|
||||
../src/H5MFpublic.h \
|
||||
../src/H5MMpublic.h \
|
||||
../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 \
|
||||
../src/H5Tprivate.h \
|
||||
../src/H5Gprivate.h \
|
||||
../src/H5Bprivate.h \
|
||||
../src/H5Iprivate.h \
|
||||
../src/H5Oprivate.h \
|
||||
../src/H5Sprivate.h
|
||||
../src/H5Tprivate.h
|
||||
overhead.o: \
|
||||
overhead.c \
|
||||
../src/hdf5.h \
|
||||
@ -717,7 +505,8 @@ stab.o: \
|
||||
../src/H5Rprivate.h \
|
||||
../src/H5Tprivate.h \
|
||||
../src/H5Gprivate.h \
|
||||
../src/H5Bprivate.h
|
||||
../src/H5Bprivate.h \
|
||||
../src/H5Gpkg.h
|
||||
tattr.o: \
|
||||
tattr.c \
|
||||
testhdf5.h \
|
||||
@ -884,7 +673,174 @@ unlink.o: \
|
||||
../src/H5Tpkg.h \
|
||||
../src/H5HGprivate.h \
|
||||
../src/H5Fprivate.h \
|
||||
../src/H5Rprivate.h
|
||||
../src/H5Rprivate.h \
|
||||
../src/H5Tprivate.h
|
||||
external.o: \
|
||||
external.c \
|
||||
h5test.h \
|
||||
../src/hdf5.h \
|
||||
../src/H5public.h \
|
||||
../src/H5config.h \
|
||||
../src/H5api_adpt.h \
|
||||
../src/H5Ipublic.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 \
|
||||
../src/H5HLpublic.h \
|
||||
../src/H5MFpublic.h \
|
||||
../src/H5MMpublic.h \
|
||||
../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 \
|
||||
../src/H5Tprivate.h
|
||||
big.o: \
|
||||
big.c \
|
||||
h5test.h \
|
||||
../src/hdf5.h \
|
||||
../src/H5public.h \
|
||||
../src/H5config.h \
|
||||
../src/H5api_adpt.h \
|
||||
../src/H5Ipublic.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 \
|
||||
../src/H5HLpublic.h \
|
||||
../src/H5MFpublic.h \
|
||||
../src/H5MMpublic.h \
|
||||
../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 \
|
||||
../src/H5Tprivate.h
|
||||
cmpd_dset.o: \
|
||||
cmpd_dset.c \
|
||||
h5test.h \
|
||||
../src/hdf5.h \
|
||||
../src/H5public.h \
|
||||
../src/H5config.h \
|
||||
../src/H5api_adpt.h \
|
||||
../src/H5Ipublic.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 \
|
||||
../src/H5HLpublic.h \
|
||||
../src/H5MFpublic.h \
|
||||
../src/H5MMpublic.h \
|
||||
../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 \
|
||||
../src/H5Tprivate.h
|
||||
mtime.o: \
|
||||
mtime.c \
|
||||
h5test.h \
|
||||
../src/hdf5.h \
|
||||
../src/H5public.h \
|
||||
../src/H5config.h \
|
||||
../src/H5api_adpt.h \
|
||||
../src/H5Ipublic.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 \
|
||||
../src/H5HLpublic.h \
|
||||
../src/H5MFpublic.h \
|
||||
../src/H5MMpublic.h \
|
||||
../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 \
|
||||
../src/H5Tprivate.h
|
||||
ohdr.o: \
|
||||
ohdr.c \
|
||||
h5test.h \
|
||||
../src/hdf5.h \
|
||||
../src/H5public.h \
|
||||
../src/H5config.h \
|
||||
../src/H5api_adpt.h \
|
||||
../src/H5Ipublic.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 \
|
||||
../src/H5HLpublic.h \
|
||||
../src/H5MFpublic.h \
|
||||
../src/H5MMpublic.h \
|
||||
../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 \
|
||||
../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 \
|
||||
@ -915,4 +871,69 @@ enum.o: \
|
||||
../src/H5Tpkg.h \
|
||||
../src/H5HGprivate.h \
|
||||
../src/H5Fprivate.h \
|
||||
../src/H5Rprivate.h
|
||||
../src/H5Rprivate.h \
|
||||
../src/H5Tprivate.h
|
||||
dsets.o: \
|
||||
dsets.c \
|
||||
h5test.h \
|
||||
../src/hdf5.h \
|
||||
../src/H5public.h \
|
||||
../src/H5config.h \
|
||||
../src/H5api_adpt.h \
|
||||
../src/H5Ipublic.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 \
|
||||
../src/H5HLpublic.h \
|
||||
../src/H5MFpublic.h \
|
||||
../src/H5MMpublic.h \
|
||||
../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 \
|
||||
../src/H5Tprivate.h
|
||||
dtypes.o: \
|
||||
dtypes.c \
|
||||
h5test.h \
|
||||
../src/hdf5.h \
|
||||
../src/H5public.h \
|
||||
../src/H5config.h \
|
||||
../src/H5api_adpt.h \
|
||||
../src/H5Ipublic.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 \
|
||||
../src/H5HLpublic.h \
|
||||
../src/H5MFpublic.h \
|
||||
../src/H5MMpublic.h \
|
||||
../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 \
|
||||
../src/H5Tprivate.h
|
||||
|
||||
@ -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)) {
|
||||
|
||||
@ -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];
|
||||
|
||||
14
test/dsets.c
14
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);
|
||||
|
||||
214
test/dtypes.c
214
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++) {
|
||||
|
||||
|
||||
24
test/enum.c
24
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)
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
10
test/ohdr.c
10
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;
|
||||
|
||||
@ -594,7 +594,6 @@ display_float_type(hid_t type, int indent)
|
||||
indent, "", (unsigned long)esize, 1==esize?"":"s",
|
||||
(unsigned long)epos, (unsigned long)ebias);
|
||||
printf("\n%*s(sign bit at %lu)", indent, "", (unsigned long)spos);
|
||||
return TRUE;
|
||||
|
||||
/* Display internal padding */
|
||||
if (1+esize+msize<H5Tget_precision(type)) {
|
||||
@ -1590,7 +1589,7 @@ get_width(void)
|
||||
* value is sometimes wrong.
|
||||
*/
|
||||
if ((s=getenv("COLUMNS")) && *s && isdigit(*s)) {
|
||||
width = strtol(s, NULL, 0);
|
||||
width = (int)strtol(s, NULL, 0);
|
||||
}
|
||||
|
||||
#if defined(HAVE_STRUCT_VIDEOCONFIG) && defined(HAVE__GETVIDEOCONFIG)
|
||||
@ -1712,7 +1711,7 @@ main (int argc, char *argv[])
|
||||
} else if (!strcmp(argv[argno], "--string")) {
|
||||
string_g = TRUE;
|
||||
} else if (!strncmp(argv[argno], "--width=", 8)) {
|
||||
width_g = strtol(argv[argno]+8, &rest, 0);
|
||||
width_g = (int)strtol(argv[argno]+8, &rest, 0);
|
||||
if (width_g<=0 || *rest) {
|
||||
usage(progname);
|
||||
exit(1);
|
||||
@ -1732,7 +1731,7 @@ main (int argc, char *argv[])
|
||||
} else {
|
||||
s = argv[++argno];
|
||||
}
|
||||
width_g = strtol(s, &rest, 0);
|
||||
width_g = (int)strtol(s, &rest, 0);
|
||||
if (width_g<=0 || *rest) {
|
||||
usage(progname);
|
||||
exit(1);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user