summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README2
-rw-r--r--config/irix6424
-rw-r--r--src/.distdep342
-rw-r--r--src/H5A.c2
-rw-r--r--src/H5D.c5
-rw-r--r--src/H5Distore.c3
-rw-r--r--src/H5F.c4
-rw-r--r--src/H5Fistore.c3
-rw-r--r--src/H5Flow.c6
-rw-r--r--src/H5G.c14
-rw-r--r--src/H5I.c2
-rw-r--r--src/H5Ocomp.c2
-rw-r--r--src/H5P.c2
-rw-r--r--src/H5R.c2
-rw-r--r--src/H5RA.c4
-rw-r--r--src/H5T.c6
-rw-r--r--src/H5Tbit.c23
-rw-r--r--src/H5Tconv.c38
-rw-r--r--src/H5Z.c6
-rw-r--r--src/H5detect.c1
-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
-rw-r--r--tools/h5ls.c7
29 files changed, 650 insertions, 585 deletions
diff --git a/README b/README
index 2a3d354..069b84a 100644
--- a/README
+++ b/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.
------------------------------------------------------------------------------
diff --git a/config/irix64 b/config/irix64
index 1bedb5d..5512c41 100644
--- a/config/irix64
+++ b/config/irix64
@@ -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=
;;
diff --git a/src/.distdep b/src/.distdep
index 730145a..aa275bb 100644
--- a/src/.distdep
+++ b/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,8 +1043,20 @@ H5T.o: \
H5MMpublic.h \
H5Tpkg.h \
H5Rprivate.h
-H5Tbit.o: \
- H5Tbit.c \
+H5TB.o: \
+ H5TB.c \
+ H5private.h \
+ H5public.h \
+ H5config.h \
+ H5api_adpt.h \
+ H5Iprivate.h \
+ H5Ipublic.h \
+ H5Eprivate.h \
+ H5Epublic.h \
+ H5MMprivate.h \
+ H5MMpublic.h
+H5V.o: \
+ H5V.c \
H5private.h \
H5public.h \
H5config.h \
@@ -1192,19 +1064,110 @@ H5Tbit.o: \
H5Eprivate.h \
H5Epublic.h \
H5Ipublic.h \
- H5Iprivate.h \
- H5Tpkg.h \
+ H5Oprivate.h \
+ H5Opublic.h \
+ H5Fprivate.h \
+ H5Fpublic.h \
+ H5Dpublic.h \
+ H5Gprivate.h \
+ H5Gpublic.h \
+ H5Bprivate.h \
+ H5Bpublic.h \
+ H5HGprivate.h \
+ 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 \
- H5Rprivate.h \
- H5Rpublic.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
+ 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 \
@@ -1229,42 +1192,57 @@ H5Tconv.o: \
H5Tpublic.h \
H5Gprivate.h \
H5Gpublic.h
-H5Tinit.o: \
- H5Tinit.c \
+H5Flow.o: \
+ H5Flow.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 \
+ H5Ipublic.h \
H5Fprivate.h \
H5Fpublic.h \
- H5Dpublic.h \
- H5Rprivate.h \
- H5Rpublic.h \
- H5Tprivate.h \
- H5Tpublic.h
-H5TB.o: \
- H5TB.c \
+ H5Dpublic.h
+H5G.o: \
+ H5G.c \
H5private.h \
H5public.h \
H5config.h \
H5api_adpt.h \
- H5Iprivate.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
-H5V.o: \
- H5V.c \
+H5Tbit.o: \
+ H5Tbit.c \
H5private.h \
H5public.h \
H5config.h \
@@ -1272,17 +1250,39 @@ H5V.o: \
H5Eprivate.h \
H5Epublic.h \
H5Ipublic.h \
- H5Oprivate.h \
- H5Opublic.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 \
- H5Bprivate.h \
- H5Bpublic.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: \
diff --git a/src/H5A.c b/src/H5A.c
index 94c4c66..a52d773 100644
--- a/src/H5A.c
+++ b/src/H5A.c
@@ -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);
diff --git a/src/H5D.c b/src/H5D.c
index f3ef9d1..a303af5 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -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,
diff --git a/src/H5Distore.c b/src/H5Distore.c
index 7f3fb7f..a4d415c 100644
--- a/src/H5Distore.c
+++ b/src/H5Distore.c
@@ -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];
diff --git a/src/H5F.c b/src/H5F.c
index 5cc5cf8..b2f351d 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -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);
}
diff --git a/src/H5Fistore.c b/src/H5Fistore.c
index 7f3fb7f..a4d415c 100644
--- a/src/H5Fistore.c
+++ b/src/H5Fistore.c
@@ -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];
diff --git a/src/H5Flow.c b/src/H5Flow.c
index cb518e6..2ec0897e 100644
--- a/src/H5Flow.c
+++ b/src/H5Flow.c
@@ -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);
}
diff --git a/src/H5G.c b/src/H5G.c
index fd7659e..b75f20f 100644
--- a/src/H5G.c
+++ b/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))) {
diff --git a/src/H5I.c b/src/H5I.c
index 54e516f..a9bf18f 100644
--- a/src/H5I.c
+++ b/src/H5I.c
@@ -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
diff --git a/src/H5Ocomp.c b/src/H5Ocomp.c
index 32c4760..33e927c 100644
--- a/src/H5Ocomp.c
+++ b/src/H5Ocomp.c
@@ -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*/
diff --git a/src/H5P.c b/src/H5P.c
index e1734b2..230e81a 100644
--- a/src/H5P.c
+++ b/src/H5P.c
@@ -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));
}
diff --git a/src/H5R.c b/src/H5R.c
index e6b09fc..261aae1 100644
--- a/src/H5R.c
+++ b/src/H5R.c
@@ -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 */
diff --git a/src/H5RA.c b/src/H5RA.c
index 1c5a9f4..76455b5 100644
--- a/src/H5RA.c
+++ b/src/H5RA.c
@@ -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");
}
diff --git a/src/H5T.c b/src/H5T.c
index 61b6521..746afa6 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -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");
diff --git a/src/H5Tbit.c b/src/H5Tbit.c
index ed074ab..f675794 100644
--- a/src/H5Tbit.c
+++ b/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;
}
}
}
diff --git a/src/H5Tconv.c b/src/H5Tconv.c
index 8816894..462bc25 100644
--- a/src/H5Tconv.c
+++ b/src/H5Tconv.c
@@ -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;
diff --git a/src/H5Z.c b/src/H5Z.c
index c9c6d13..bb22f47 100644
--- a/src/H5Z.c
+++ b/src/H5Z.c
@@ -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;
diff --git a/src/H5detect.c b/src/H5detect.c
index 92fe3ae..3346b91 100644
--- a/src/H5detect.c
+++ b/src/H5detect.c
@@ -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); \
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;
diff --git a/tools/h5ls.c b/tools/h5ls.c
index b6268bf..64775fe 100644
--- a/tools/h5ls.c
+++ b/tools/h5ls.c
@@ -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);
generated by cgit v0.12 at 2024-11-06 07:29:00 (GMT)