From aedc78af6be943a4070c0e04cd157c9e1b17d06e Mon Sep 17 00:00:00 2001 From: Robb Matzke Date: Thu, 18 Feb 1999 14:38:45 -0500 Subject: [svn-r1081] Changes since 19990218 ---------------------- ./src/H5Shyper.c Changed hyperslab offset arrays to signed quantities to get rid of warnings on DEC cluster. ./src/H5Flow.c ./src/H5Fprivate.h Changed the objno argument of H5F_addr_pack() to be unsigned to get rid of warnings on DEC cluster. --- src/.distdep | 260 +++++++++++++++++++++++++++---------------------------- src/H5Flow.c | 2 +- src/H5Fprivate.h | 3 +- src/H5Shyper.c | 14 +-- test/.distdep | 63 +++++++++----- 5 files changed, 183 insertions(+), 159 deletions(-) diff --git a/src/.distdep b/src/.distdep index ba25bdb..975bda6 100644 --- a/src/.distdep +++ b/src/.distdep @@ -1,3 +1,35 @@ +H5.o: \ + H5.c \ + H5private.h \ + H5public.h \ + H5config.h \ + H5api_adpt.h \ + H5ACprivate.h \ + H5ACpublic.h \ + H5Fprivate.h \ + H5Fpublic.h \ + H5Ipublic.h \ + H5Dpublic.h \ + H5Bprivate.h \ + H5Bpublic.h \ + H5Eprivate.h \ + H5Epublic.h \ + H5Iprivate.h \ + H5MMprivate.h \ + H5MMpublic.h \ + H5Pprivate.h \ + H5Ppublic.h \ + H5Zpublic.h \ + H5Rpublic.h \ + H5Sprivate.h \ + H5Spublic.h \ + H5Gprivate.h \ + H5Gpublic.h \ + H5Oprivate.h \ + H5Opublic.h \ + H5HGprivate.h \ + H5HGpublic.h \ + H5Tprivate.h H5A.o: \ H5A.c \ H5private.h \ @@ -103,6 +135,38 @@ 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 \ @@ -181,18 +245,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 \ @@ -952,33 +1004,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 \ @@ -1082,6 +1107,38 @@ H5Sselect.o: \ H5HGpublic.h \ H5Tprivate.h \ H5Tpublic.h +H5T.o: \ + H5T.c \ + H5private.h \ + H5public.h \ + H5config.h \ + H5api_adpt.h \ + H5Dprivate.h \ + H5Dpublic.h \ + H5Ipublic.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 \ + H5Iprivate.h \ + H5Eprivate.h \ + H5Epublic.h \ + H5MMprivate.h \ + H5MMpublic.h \ + H5Tpkg.h \ + H5Rprivate.h H5Tbit.o: \ H5Tbit.c \ H5private.h \ @@ -1104,6 +1161,30 @@ H5Tbit.o: \ 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 \ @@ -1187,123 +1268,42 @@ H5Z.o: \ H5Sprivate.h \ H5Spublic.h \ H5Zprivate.h -H5Tconv.o: \ - H5Tconv.c \ - H5Iprivate.h \ - H5Ipublic.h \ +H5Flow.o: \ + H5Flow.c \ + H5private.h \ H5public.h \ H5config.h \ H5api_adpt.h \ - H5private.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 \ - H5Gprivate.h \ - H5Gpublic.h -H5T.o: \ - H5T.c \ + H5Dpublic.h +H5Shyper.o: \ + H5Shyper.c \ H5private.h \ H5public.h \ H5config.h \ H5api_adpt.h \ - H5Dprivate.h \ - H5Dpublic.h \ + H5Eprivate.h \ + H5Epublic.h \ H5Ipublic.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 \ - H5Iprivate.h \ - H5Eprivate.h \ - H5Epublic.h \ - H5MMprivate.h \ - H5MMpublic.h \ - H5Tpkg.h \ - H5Rprivate.h -H5.o: \ - H5.c \ - H5private.h \ - H5public.h \ - H5config.h \ - H5api_adpt.h \ - H5ACprivate.h \ - H5ACpublic.h \ H5Fprivate.h \ H5Fpublic.h \ - H5Ipublic.h \ H5Dpublic.h \ - H5Bprivate.h \ - H5Bpublic.h \ - H5Eprivate.h \ - H5Epublic.h \ - H5Iprivate.h \ - H5MMprivate.h \ - H5MMpublic.h \ - H5Pprivate.h \ - H5Ppublic.h \ - H5Zpublic.h \ - H5Rpublic.h \ - H5Sprivate.h \ - H5Spublic.h \ - H5Gprivate.h \ - H5Gpublic.h \ - H5Oprivate.h \ - H5Opublic.h \ - H5HGprivate.h \ - H5HGpublic.h \ - H5Tprivate.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 + H5Vprivate.h diff --git a/src/H5Flow.c b/src/H5Flow.c index 29891c2..cb518e6 100644 --- a/src/H5Flow.c +++ b/src/H5Flow.c @@ -1027,7 +1027,7 @@ H5F_addr_hash(const haddr_t *addr, uintn mod) *------------------------------------------------------------------------- */ herr_t -H5F_addr_pack(H5F_t __unused__ *f, haddr_t *addr, const long objno[2]) +H5F_addr_pack(H5F_t __unused__ *f, haddr_t *addr, const unsigned long objno[2]) { assert(f); assert(objno); diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h index 4150ce8..2032129 100644 --- a/src/H5Fprivate.h +++ b/src/H5Fprivate.h @@ -660,7 +660,8 @@ __DLL__ void H5F_addr_inc(haddr_t *addr/*in,out*/, hsize_t inc); __DLL__ void H5F_addr_adj(haddr_t *addr/*in,out*/, hssize_t adj); __DLL__ void H5F_addr_add(haddr_t *, const haddr_t *); __DLL__ uintn H5F_addr_hash(const haddr_t *, uintn mod); -__DLL__ herr_t H5F_addr_pack(H5F_t *f, haddr_t *addr, const long objno[2]); +__DLL__ herr_t H5F_addr_pack(H5F_t *f, haddr_t *addr, + const unsigned long objno[2]); /* Functions for MPI-IO */ #ifdef HAVE_PARALLEL diff --git a/src/H5Shyper.c b/src/H5Shyper.c index 5c1863f..8657617 100644 --- a/src/H5Shyper.c +++ b/src/H5Shyper.c @@ -2812,12 +2812,14 @@ H5S_hyper_select_serialize (const H5S_t *space, uint8_t *buf) herr_t H5S_hyper_select_deserialize (H5S_t *space, const uint8_t *buf) { - int32_t rank; /* Rank of points */ - size_t num_elem=0; /* Number of elements in selection */ - hsize_t *start=NULL,*count=NULL; /* hyperslab information */ - hsize_t *tstart,*tcount; /* temporary hyperslab pointers */ - uintn i,j; /* local counting variables */ - herr_t ret_value=FAIL; /* return value */ + int32_t rank; /* rank of points */ + size_t num_elem=0; /* number of elements in selection */ + hssize_t *start=NULL; /* hyperslab start information */ + hsize_t *count=NULL; /* hyperslab count information */ + hssize_t *tstart=NULL; /* temporary hyperslab pointers */ + hsize_t *tcount=NULL; /* temporary hyperslab pointers */ + uintn i,j; /* local counting variables */ + herr_t ret_value=FAIL; /* return value */ FUNC_ENTER (H5S_hyper_select_deserialize, FAIL); diff --git a/test/.distdep b/test/.distdep index 7ca5bce..9d3c739 100644 --- a/test/.distdep +++ b/test/.distdep @@ -28,7 +28,8 @@ h5test.o: \ ../src/H5Tpkg.h \ ../src/H5HGprivate.h \ ../src/H5Fprivate.h \ - ../src/H5Rprivate.h + ../src/H5Rprivate.h \ + ../src/H5Tprivate.h big.o: \ big.c \ h5test.h \ @@ -59,7 +60,8 @@ big.o: \ ../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 +92,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 \ @@ -146,7 +149,8 @@ cmpd_dset.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 \ @@ -177,7 +181,8 @@ dsets.o: \ ../src/H5Tpkg.h \ ../src/H5HGprivate.h \ ../src/H5Fprivate.h \ - ../src/H5Rprivate.h + ../src/H5Rprivate.h \ + ../src/H5Tprivate.h dtypes.o: \ dtypes.c \ h5test.h \ @@ -208,7 +213,8 @@ dtypes.o: \ ../src/H5Tpkg.h \ ../src/H5HGprivate.h \ ../src/H5Fprivate.h \ - ../src/H5Rprivate.h + ../src/H5Rprivate.h \ + ../src/H5Tprivate.h extend.o: \ extend.c \ h5test.h \ @@ -239,7 +245,8 @@ extend.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 \ @@ -270,7 +277,8 @@ external.o: \ ../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 +309,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 +341,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 +373,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 +408,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 +480,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 +515,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 +547,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,7 +579,8 @@ mount.o: \ ../src/H5Tpkg.h \ ../src/H5HGprivate.h \ ../src/H5Fprivate.h \ - ../src/H5Rprivate.h + ../src/H5Rprivate.h \ + ../src/H5Tprivate.h mtime.o: \ mtime.c \ h5test.h \ @@ -595,7 +611,8 @@ mtime.o: \ ../src/H5Tpkg.h \ ../src/H5HGprivate.h \ ../src/H5Fprivate.h \ - ../src/H5Rprivate.h + ../src/H5Rprivate.h \ + ../src/H5Tprivate.h ohdr.o: \ ohdr.c \ h5test.h \ @@ -632,7 +649,8 @@ ohdr.o: \ ../src/H5Bprivate.h \ ../src/H5Iprivate.h \ ../src/H5Oprivate.h \ - ../src/H5Sprivate.h + ../src/H5Sprivate.h \ + ../src/H5Zprivate.h overhead.o: \ overhead.c \ ../src/hdf5.h \ @@ -717,7 +735,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 +903,8 @@ unlink.o: \ ../src/H5Tpkg.h \ ../src/H5HGprivate.h \ ../src/H5Fprivate.h \ - ../src/H5Rprivate.h + ../src/H5Rprivate.h \ + ../src/H5Tprivate.h enum.o: \ enum.c \ h5test.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 -- cgit v0.12