summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>1998-10-13 17:17:50 (GMT)
committerRobb Matzke <matzke@llnl.gov>1998-10-13 17:17:50 (GMT)
commit0e9e49d635c1acb45483e6d0c77b28610757ff32 (patch)
tree76f41c84a55e3b86b7e72789649f4b401f7ebe3c
parent60b0109164d3b6a1abbed3bbc923f43dbab043df (diff)
downloadhdf5-0e9e49d635c1acb45483e6d0c77b28610757ff32.zip
hdf5-0e9e49d635c1acb45483e6d0c77b28610757ff32.tar.gz
hdf5-0e9e49d635c1acb45483e6d0c77b28610757ff32.tar.bz2
[svn-r753] Changes since 19981008
---------------------- ./src/H5F.c ./src/H5Fprivate.h ./src/H5G.c ./src/H5Gpkg.h ./src/H5Gprivate.h ./src/H5Gpublic.h ./test/istore.c ./test/tstab.c Removed CWG functionality. ./tools/Makefile.in Added `_test' where I added `test' last week. Maybe now the snapshots will start up again...
-rw-r--r--src/.distdep744
-rw-r--r--src/H5F.c3
-rw-r--r--src/H5Fprivate.h1
-rw-r--r--src/H5G.c365
-rw-r--r--src/H5Gpkg.h10
-rw-r--r--src/H5Gprivate.h5
-rw-r--r--src/H5Gpublic.h3
-rw-r--r--test/.distdep204
-rw-r--r--test/istore.c4
-rw-r--r--test/tstab.c47
-rw-r--r--tools/Makefile.in2
11 files changed, 494 insertions, 894 deletions
diff --git a/src/.distdep b/src/.distdep
index 635b025..d2694aa 100644
--- a/src/.distdep
+++ b/src/.distdep
@@ -1,36 +1,3 @@
-H5A.o: \
- H5A.c \
- H5private.h \
- H5public.h \
- H5config.h \
- H5Iprivate.h \
- H5Ipublic.h \
- H5Bprivate.h \
- H5Bpublic.h \
- H5Fprivate.h \
- H5Fpublic.h \
- H5Dpublic.h \
- H5Dprivate.h \
- H5Gprivate.h \
- H5Gpublic.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 \
- H5MMprivate.h \
- H5MMpublic.h \
- H5Pprivate.h \
- H5Ppublic.h \
- H5Apkg.h \
- H5Aprivate.h
H5AC.o: \
H5AC.c \
H5private.h \
@@ -62,85 +29,6 @@ H5B.o: \
H5MFprivate.h \
H5MFpublic.h \
H5MMprivate.h
-H5D.o: \
- H5D.c \
- H5private.h \
- H5public.h \
- H5config.h \
- H5Iprivate.h \
- H5Ipublic.h \
- H5ACprivate.h \
- H5ACpublic.h \
- H5Fprivate.h \
- H5Fpublic.h \
- H5Dpublic.h \
- H5Dprivate.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 \
- H5HLprivate.h \
- H5HLpublic.h \
- H5MFprivate.h \
- H5MFpublic.h \
- H5MMprivate.h \
- H5MMpublic.h \
- H5Pprivate.h \
- H5Ppublic.h \
- H5TBprivate.h
-H5E.o: \
- H5E.c \
- H5private.h \
- H5public.h \
- H5config.h \
- H5Iprivate.h \
- H5Ipublic.h \
- H5Eprivate.h
-H5F.o: \
- H5F.c \
- H5private.h \
- H5public.h \
- H5config.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 \
- H5MMprivate.h \
- H5MMpublic.h
H5Farray.o: \
H5Farray.c \
H5private.h \
@@ -226,34 +114,6 @@ H5Flow.o: \
H5Dpublic.h \
H5MMprivate.h \
H5MMpublic.h
-H5Fmpio.o: \
- H5Fmpio.c \
- H5private.h \
- H5public.h \
- H5config.h \
- H5Eprivate.h \
- H5Epublic.h \
- H5Ipublic.h \
- H5Dprivate.h \
- H5Dpublic.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 \
- H5MMprivate.h \
- H5MMpublic.h
H5Fsec2.o: \
H5Fsec2.c \
H5private.h \
@@ -293,39 +153,6 @@ H5Fstdio.o: \
H5Dpublic.h \
H5MMprivate.h \
H5MMpublic.h
-H5G.o: \
- H5G.c \
- H5private.h \
- H5public.h \
- H5config.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
H5Gent.o: \
H5Gent.c \
H5private.h \
@@ -377,53 +204,6 @@ H5Gnode.o: \
H5Sprivate.h \
H5Spublic.h \
H5Zprivate.h
-H5Gstab.o: \
- H5Gstab.c \
- H5private.h \
- H5public.h \
- H5config.h \
- H5ACprivate.h \
- H5ACpublic.h \
- H5Fprivate.h \
- H5Fpublic.h \
- H5Ipublic.h \
- H5Dpublic.h \
- H5Eprivate.h \
- H5Epublic.h \
- H5Gpkg.h \
- H5Gprivate.h \
- H5Gpublic.h \
- H5Bprivate.h \
- H5Bpublic.h \
- H5HLprivate.h \
- H5HLpublic.h \
- H5MMprivate.h \
- H5MMpublic.h \
- H5Oprivate.h \
- H5Opublic.h \
- H5HGprivate.h \
- H5HGpublic.h \
- H5Tprivate.h \
- H5Tpublic.h \
- H5Sprivate.h
-H5HG.o: \
- H5HG.c \
- H5private.h \
- H5public.h \
- H5config.h \
- H5ACprivate.h \
- H5ACpublic.h \
- H5Fprivate.h \
- H5Fpublic.h \
- H5Ipublic.h \
- H5Dpublic.h \
- H5Eprivate.h \
- H5Epublic.h \
- H5HGprivate.h \
- H5HGpublic.h \
- H5MFprivate.h \
- H5MFpublic.h \
- H5MMprivate.h
H5HL.o: \
H5HL.c \
H5private.h \
@@ -611,29 +391,6 @@ H5Oefl.o: \
H5Sprivate.h \
H5Spublic.h \
H5Zprivate.h
-H5Ofill.o: \
- H5Ofill.c \
- H5private.h \
- H5public.h \
- H5config.h \
- H5Eprivate.h \
- H5Epublic.h \
- H5Ipublic.h \
- H5MMprivate.h \
- H5MMpublic.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
H5Olayout.o: \
H5Olayout.c \
H5private.h \
@@ -790,58 +547,171 @@ H5Ostab.o: \
H5HGpublic.h \
H5Tprivate.h \
H5Tpublic.h
-H5P.o: \
- H5P.c \
+H5Sall.o: \
+ H5Sall.c \
H5private.h \
H5public.h \
H5config.h \
- H5Iprivate.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
+H5Spoint.o: \
+ H5Spoint.c \
+ H5private.h \
+ H5public.h \
+ H5config.h \
+ H5Eprivate.h \
+ H5Epublic.h \
+ H5Ipublic.h \
+ H5MMprivate.h \
+ H5MMpublic.h \
+ H5Sprivate.h \
+ H5Spublic.h \
H5Fprivate.h \
H5Fpublic.h \
H5Dpublic.h \
- H5Dprivate.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 \
+ H5Vprivate.h
+H5Tbit.o: \
+ H5Tbit.c \
+ H5private.h \
+ H5public.h \
+ H5config.h \
H5Eprivate.h \
H5Epublic.h \
- H5MMprivate.h
-H5R.o: \
- H5R.c \
+ H5Ipublic.h \
+ H5Iprivate.h \
+ H5Tpkg.h \
+ H5HGprivate.h \
+ H5HGpublic.h \
+ H5Fprivate.h \
+ H5Fpublic.h \
+ H5Dpublic.h \
+ H5Tprivate.h \
+ H5Tpublic.h \
+ H5Gprivate.h
+H5V.o: \
+ H5V.c \
H5private.h \
H5public.h \
H5config.h \
- H5Iprivate.h \
- H5Ipublic.h \
- H5Eprivate.h
-H5RA.o: \
- H5RA.c \
- H5RAprivate.h \
- H5RApublic.h \
+ H5Eprivate.h \
+ H5Epublic.h \
H5Ipublic.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 \
+ H5Sprivate.h \
+ H5Spublic.h
+H5Z.o: \
+ H5Z.c \
+ H5private.h \
H5public.h \
H5config.h \
- H5Dprivate.h \
+ H5Eprivate.h \
+ H5Epublic.h \
+ H5Ipublic.h \
+ H5MMprivate.h \
+ H5MMpublic.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 \
+ H5Sprivate.h \
+ H5Spublic.h \
+ H5Zprivate.h \
+ H5Zpublic.h
+H5.o: \
+ H5.c \
H5private.h \
+ H5public.h \
+ H5config.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 \
+ H5Sprivate.h \
+ H5Spublic.h \
H5Gprivate.h \
H5Gpublic.h \
+ H5Oprivate.h \
+ H5Opublic.h \
+ H5HGprivate.h \
+ H5HGpublic.h \
+ H5Tprivate.h \
+ H5Tpublic.h
+H5A.o: \
+ H5A.c \
+ H5private.h \
+ H5public.h \
+ H5config.h \
+ H5Iprivate.h \
+ H5Ipublic.h \
H5Bprivate.h \
H5Bpublic.h \
+ H5Fprivate.h \
+ H5Fpublic.h \
+ H5Dpublic.h \
+ H5Dprivate.h \
+ H5Gprivate.h \
+ H5Gpublic.h \
H5Oprivate.h \
H5Opublic.h \
H5HGprivate.h \
@@ -853,63 +723,127 @@ H5RA.o: \
H5Zprivate.h \
H5Zpublic.h \
H5Eprivate.h \
- H5Epublic.h
-H5S.o: \
- H5S.c \
+ H5Epublic.h \
+ H5MMprivate.h \
+ H5MMpublic.h \
+ H5Pprivate.h \
+ H5Ppublic.h \
+ H5Apkg.h \
+ H5Aprivate.h
+H5D.o: \
+ H5D.c \
H5private.h \
H5public.h \
H5config.h \
H5Iprivate.h \
H5Ipublic.h \
- H5Eprivate.h \
- H5Epublic.h \
- H5MMprivate.h \
- H5MMpublic.h \
- H5Oprivate.h \
- H5Opublic.h \
+ H5ACprivate.h \
+ H5ACpublic.h \
H5Fprivate.h \
H5Fpublic.h \
H5Dpublic.h \
+ H5Dprivate.h \
H5Gprivate.h \
H5Gpublic.h \
H5Bprivate.h \
H5Bpublic.h \
+ H5Oprivate.h \
+ H5Opublic.h \
H5HGprivate.h \
H5HGpublic.h \
- H5Tprivate.h
-H5Sall.o: \
- H5Sall.c \
+ H5Tprivate.h \
+ H5Tpublic.h \
+ H5Sprivate.h \
+ H5Spublic.h \
+ H5Zprivate.h \
+ H5Zpublic.h \
+ H5Eprivate.h \
+ H5Epublic.h \
+ H5HLprivate.h \
+ H5HLpublic.h \
+ H5MFprivate.h \
+ H5MFpublic.h \
+ H5MMprivate.h \
+ H5MMpublic.h \
+ H5Pprivate.h \
+ H5Ppublic.h \
+ H5TBprivate.h
+H5E.o: \
+ H5E.c \
H5private.h \
H5public.h \
H5config.h \
- H5Eprivate.h \
- H5Epublic.h \
+ H5Iprivate.h \
H5Ipublic.h \
- H5Sprivate.h \
- H5Spublic.h \
+ H5Eprivate.h
+H5Gstab.o: \
+ H5Gstab.c \
+ H5private.h \
+ H5public.h \
+ H5config.h \
+ H5ACprivate.h \
+ H5ACpublic.h \
H5Fprivate.h \
H5Fpublic.h \
+ H5Ipublic.h \
H5Dpublic.h \
+ H5Eprivate.h \
+ H5Epublic.h \
+ H5Gpkg.h \
H5Gprivate.h \
H5Gpublic.h \
H5Bprivate.h \
H5Bpublic.h \
+ H5HLprivate.h \
+ H5HLpublic.h \
+ H5MMprivate.h \
+ H5MMpublic.h \
H5Oprivate.h \
H5Opublic.h \
H5HGprivate.h \
H5HGpublic.h \
H5Tprivate.h \
- H5Tpublic.h
-H5Shyper.o: \
- H5Shyper.c \
+ H5Tpublic.h \
+ H5Sprivate.h
+H5HG.o: \
+ H5HG.c \
H5private.h \
H5public.h \
H5config.h \
+ H5ACprivate.h \
+ H5ACpublic.h \
+ H5Fprivate.h \
+ H5Fpublic.h \
+ H5Ipublic.h \
+ H5Dpublic.h \
H5Eprivate.h \
H5Epublic.h \
+ H5HGprivate.h \
+ H5HGpublic.h \
+ H5MFprivate.h \
+ H5MFpublic.h \
+ H5MMprivate.h
+H5I.o: \
+ H5I.c \
+ H5private.h \
+ H5public.h \
+ H5config.h \
+ H5Iprivate.h \
H5Ipublic.h \
- H5Sprivate.h \
- H5Spublic.h \
+ H5Eprivate.h
+H5Ofill.o: \
+ H5Ofill.c \
+ H5private.h \
+ H5public.h \
+ H5config.h \
+ H5Eprivate.h \
+ H5Epublic.h \
+ H5Ipublic.h \
+ H5Iprivate.h \
+ H5MMprivate.h \
+ H5MMpublic.h \
+ H5Oprivate.h \
+ H5Opublic.h \
H5Fprivate.h \
H5Fpublic.h \
H5Dpublic.h \
@@ -917,27 +851,58 @@ H5Shyper.o: \
H5Gpublic.h \
H5Bprivate.h \
H5Bpublic.h \
+ H5HGprivate.h \
+ H5HGpublic.h \
+ H5Tprivate.h
+H5P.o: \
+ H5P.c \
+ H5private.h \
+ H5public.h \
+ H5config.h \
+ H5Iprivate.h \
+ H5Ipublic.h \
+ H5Bprivate.h \
+ H5Bpublic.h \
+ H5Fprivate.h \
+ H5Fpublic.h \
+ H5Dpublic.h \
+ H5Dprivate.h \
+ H5Gprivate.h \
+ H5Gpublic.h \
H5Oprivate.h \
H5Opublic.h \
H5HGprivate.h \
H5HGpublic.h \
H5Tprivate.h \
H5Tpublic.h \
+ H5Sprivate.h \
+ H5Spublic.h \
H5Zprivate.h \
H5Zpublic.h \
- H5Vprivate.h \
- H5MMprivate.h \
- H5MMpublic.h
-H5Smpio.o: \
- H5Smpio.c \
+ H5Eprivate.h \
+ H5Epublic.h \
+ H5MMprivate.h
+H5R.o: \
+ H5R.c \
H5private.h \
H5public.h \
H5config.h \
+ H5Iprivate.h \
+ H5Ipublic.h \
+ H5Eprivate.h
+H5S.o: \
+ H5S.c \
+ H5private.h \
+ H5public.h \
+ H5config.h \
+ H5Iprivate.h \
+ H5Ipublic.h \
H5Eprivate.h \
H5Epublic.h \
- H5Ipublic.h \
- H5Sprivate.h \
- H5Spublic.h \
+ H5MMprivate.h \
+ H5MMpublic.h \
+ H5Oprivate.h \
+ H5Opublic.h \
H5Fprivate.h \
H5Fpublic.h \
H5Dpublic.h \
@@ -945,22 +910,17 @@ H5Smpio.o: \
H5Gpublic.h \
H5Bprivate.h \
H5Bpublic.h \
- H5Oprivate.h \
- H5Opublic.h \
H5HGprivate.h \
H5HGpublic.h \
- H5Tprivate.h \
- H5Tpublic.h
-H5Spoint.o: \
- H5Spoint.c \
+ H5Tprivate.h
+H5Shyper.o: \
+ H5Shyper.c \
H5private.h \
H5public.h \
H5config.h \
H5Eprivate.h \
H5Epublic.h \
H5Ipublic.h \
- H5MMprivate.h \
- H5MMpublic.h \
H5Sprivate.h \
H5Spublic.h \
H5Fprivate.h \
@@ -978,7 +938,9 @@ H5Spoint.o: \
H5Tpublic.h \
H5Zprivate.h \
H5Zpublic.h \
- H5Vprivate.h
+ H5Vprivate.h \
+ H5MMprivate.h \
+ H5MMpublic.h
H5Sselect.o: \
H5Sselect.c \
H5private.h \
@@ -1035,115 +997,93 @@ H5T.o: \
H5Eprivate.h \
H5Epublic.h \
H5MMprivate.h
-H5Tbit.o: \
- H5Tbit.c \
+H5TB.o: \
+ H5TB.c \
H5private.h \
H5public.h \
H5config.h \
- H5Eprivate.h \
- H5Epublic.h \
- H5Ipublic.h \
- H5Iprivate.h \
- H5Tpkg.h \
- H5HGprivate.h \
- H5HGpublic.h \
- H5Fprivate.h \
- H5Fpublic.h \
- H5Dpublic.h \
- H5Tprivate.h \
- H5Tpublic.h \
- H5Gprivate.h
-H5Tconv.o: \
- H5Tconv.c \
H5Iprivate.h \
H5Ipublic.h \
+ H5Eprivate.h
+H5F.o: \
+ H5F.c \
+ H5private.h \
H5public.h \
H5config.h \
- H5private.h \
- H5Eprivate.h \
- H5Epublic.h \
- H5MMprivate.h \
- H5MMpublic.h \
- H5Tpkg.h \
- H5HGprivate.h \
- H5HGpublic.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 \
- H5Gprivate.h \
- H5Gpublic.h \
- H5Bprivate.h \
- H5Bpublic.h
-H5Tinit.o: \
- H5Tinit.c \
- H5private.h \
- H5public.h \
- H5config.h \
+ H5Sprivate.h \
+ H5Spublic.h \
+ H5Zprivate.h \
+ H5Zpublic.h \
H5Iprivate.h \
- H5Ipublic.h \
+ H5ACprivate.h \
+ H5ACpublic.h \
H5Eprivate.h \
H5Epublic.h \
H5MMprivate.h \
- H5MMpublic.h \
- H5Tpkg.h \
- H5HGprivate.h \
- H5HGpublic.h \
- H5Fprivate.h \
- H5Fpublic.h \
- H5Dpublic.h \
- H5Tprivate.h
-H5TB.o: \
- H5TB.c \
- H5private.h \
- H5public.h \
- H5config.h \
- H5Iprivate.h \
- H5Ipublic.h \
- H5Eprivate.h
-H5V.o: \
- H5V.c \
+ H5MMpublic.h
+H5Fmpio.o: \
+ H5Fmpio.c \
H5private.h \
H5public.h \
H5config.h \
H5Eprivate.h \
H5Epublic.h \
H5Ipublic.h \
- H5Oprivate.h \
- H5Opublic.h \
+ H5Dprivate.h \
+ H5Dpublic.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 \
H5Sprivate.h \
- H5Spublic.h
-H5Z.o: \
- H5Z.c \
+ H5Spublic.h \
+ H5Zprivate.h \
+ H5Zpublic.h \
+ H5MMprivate.h \
+ H5MMpublic.h
+H5G.o: \
+ H5G.c \
H5private.h \
H5public.h \
H5config.h \
- H5Eprivate.h \
- H5Epublic.h \
+ H5Aprivate.h \
+ H5Apublic.h \
H5Ipublic.h \
- H5MMprivate.h \
- H5MMpublic.h \
- H5Oprivate.h \
- H5Opublic.h \
- H5Fprivate.h \
- H5Fpublic.h \
- H5Dpublic.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 \
@@ -1151,43 +1091,75 @@ H5Z.o: \
H5Sprivate.h \
H5Spublic.h \
H5Zprivate.h \
- H5Zpublic.h
-H5.o: \
- H5.c \
+ H5Zpublic.h \
+ H5Eprivate.h \
+ H5Epublic.h \
+ H5Gpkg.h \
+ H5ACprivate.h \
+ H5ACpublic.h \
+ H5HLprivate.h \
+ H5HLpublic.h
+H5Smpio.o: \
+ H5Smpio.c \
H5private.h \
H5public.h \
H5config.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 \
+ 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
-H5I.o: \
- H5I.c \
+H5Tconv.o: \
+ H5Tconv.c \
+ H5Iprivate.h \
+ H5Ipublic.h \
+ H5public.h \
+ H5config.h \
+ H5private.h \
+ H5Eprivate.h \
+ H5Epublic.h \
+ H5MMprivate.h \
+ H5MMpublic.h \
+ H5Tpkg.h \
+ H5HGprivate.h \
+ H5HGpublic.h \
+ H5Fprivate.h \
+ H5Fpublic.h \
+ H5Dpublic.h \
+ H5Tprivate.h \
+ H5Tpublic.h \
+ H5Gprivate.h \
+ H5Gpublic.h \
+ H5Bprivate.h \
+ H5Bpublic.h
+H5Tinit.o: \
+ H5Tinit.c \
H5private.h \
H5public.h \
H5config.h \
H5Iprivate.h \
H5Ipublic.h \
- H5Eprivate.h
+ H5Eprivate.h \
+ H5Epublic.h \
+ H5MMprivate.h \
+ H5MMpublic.h \
+ H5Tpkg.h \
+ H5HGprivate.h \
+ H5HGpublic.h \
+ H5Fprivate.h \
+ H5Fpublic.h \
+ H5Dpublic.h \
+ H5Tprivate.h
diff --git a/src/H5F.c b/src/H5F.c
index fe3dfb6..7b7a3ec 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -1537,9 +1537,6 @@ H5F_close(H5F_t *f)
{
FUNC_ENTER(H5F_close, FAIL);
- /* Close all current working groups */
- while (H5G_pop(f)>=0) /*void*/;
-
/*
* If object headers are still open then delay deletion of resources until
* they have all been closed. Flush all caches and update the object
diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h
index 8f33cc0..74e67d0 100644
--- a/src/H5Fprivate.h
+++ b/src/H5Fprivate.h
@@ -479,7 +479,6 @@ typedef struct H5F_t {
uintn intent; /* The flags passed to H5F_open()*/
char *name; /* Name used to open file */
H5F_file_t *shared; /* The shared file info */
- struct H5G_cwgstk_t *cwg_stack; /* CWG stack for push/pop functions*/
uintn nopen; /* Number of open object headers*/
hbool_t close_pending; /* File close is pending */
H5F_mtab_t mtab; /* File mount table */
diff --git a/src/H5G.c b/src/H5G.c
index 2aa045d..e2d0e39 100644
--- a/src/H5G.c
+++ b/src/H5G.c
@@ -248,182 +248,6 @@ H5Gclose(hid_t group_id)
/*-------------------------------------------------------------------------
- * Function: H5Gset
- *
- * Purpose: Sets the working group for file handle FILE to the
- * specified group.
- *
- * Each file handle maintains its own notion of the current
- * working group. That is, if a single file is opened with
- * multiple calls to H5Fopen(), which returns multiple file
- * handles, then each handle's current working group can be
- * set independently of the other file handles for that file.
- *
- * The initial current working group is the root group.
- *
- * See also: H5Gpush(), H5Gpop()
- *
- * Errors:
- *
- * Return: Success: SUCCEED
- *
- * Failure: FAIL
- *
- * Programmer: Robb Matzke
- * Wednesday, September 24, 1997
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Gset(hid_t loc_id, const char *name)
-{
- H5G_t *grp = NULL;
- H5G_entry_t *loc = NULL;
-
- FUNC_ENTER(H5Gset, FAIL);
- H5TRACE2("e","is",loc_id,name);
-
- /* Check/fix arguments */
- if (NULL==(loc=H5G_loc(loc_id))) {
- HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location");
- }
- if (!name || !*name) {
- HRETURN_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name");
- }
-
- /* Set the current working group */
- if (NULL == (grp = H5G_open(loc, name))) {
- HRETURN_ERROR(H5E_ARGS, H5E_NOTFOUND, FAIL, "no such group");
- }
- if (H5G_set(grp) < 0) {
- HRETURN_ERROR(H5E_SYM, H5E_CANTINIT, FAIL,
- "unable to change current working group");
- }
-
- /* Close the handle */
- if (H5G_close(grp)<0) {
- HRETURN_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to close group");
- }
- FUNC_LEAVE(SUCCEED);
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: H5Gpush
- *
- * Purpose: Similar to H5Gset() except the new working group is pushed
- * on a stack.
- *
- * Each file handle maintains its own notion of the current
- * working group. That is, if a single file is opened with
- * multiple calls to H5Fopen(), which returns multiple file
- * handles, then each handle's current working group can be
- * set independently of the other file handles for that file.
- *
- * See also: H5Gset(), H5Gpop()
- *
- * Errors:
- *
- * Return: Success: SUCCEED
- *
- * Failure: FAIL
- *
- * Programmer: Robb Matzke
- * Wednesday, September 24, 1997
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Gpush(hid_t loc_id, const char *name)
-{
- H5G_t *grp = NULL;
- H5G_entry_t *loc = NULL;
-
- FUNC_ENTER(H5Gpush, FAIL);
- H5TRACE2("e","is",loc_id,name);
-
- /* Check arguments */
- if (NULL == (loc = H5G_loc(loc_id))) {
- HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location");
- }
- if (!name || !*name) {
- HRETURN_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name");
- }
-
- /* Push group onto stack */
- if (NULL == (grp = H5G_open(loc, name))) {
- HRETURN_ERROR(H5E_ARGS, H5E_NOTFOUND, FAIL, "no such group");
- }
- if (H5G_push(grp) < 0) {
- HRETURN_ERROR(H5E_SYM, H5E_CANTINIT, FAIL,
- "can't change current working group");
- }
- /* Close the handle */
- if (H5G_close(grp) < 0) {
- HRETURN_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to close group");
- }
- FUNC_LEAVE(SUCCEED);
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: H5Gpop
- *
- * Purpose: Removes the top (latest) entry from the working group stack
- * and sets the current working group to the previous value.
- *
- * Each file handle maintains its own notion of the current
- * working group. That is, if a single file is opened with
- * multiple calls to H5Fopen(), which returns multiple file
- * handles, then each handle's current working group can be
- * set independently of the other file handles for that file.
- *
- * If LOC_ID is a group ID then it's used only to determine the
- * file from which to pop.
- *
- * See also: H5Gset(), H5Gpush()
- *
- * Errors:
- *
- * Return: Success: SUCCEED
- *
- * Failure: FAIL. The final entry cannot be popped from
- * the group stack (but it can be changed
- * with H5Gset()).
- *
- * Programmer: Robb Matzke
- * Wednesday, September 24, 1997
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Gpop(hid_t loc_id)
-{
- H5G_entry_t *loc = NULL;
-
- FUNC_ENTER(H5Gpop, FAIL);
- H5TRACE1("e","i",loc_id);
-
- /* Check arguments */
- if (NULL == (loc = H5G_loc(loc_id))) {
- HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location");
- }
-
- /* pop */
- if (H5G_pop(loc->file)<0) {
- HRETURN_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "stack is empty");
- }
- FUNC_LEAVE(SUCCEED);
-}
-
-
-/*-------------------------------------------------------------------------
* Function: H5Giterate
*
* Purpose: Iterates over the entries of a group. The LOC_ID and NAME
@@ -1073,7 +897,7 @@ H5G_namei(H5G_entry_t *loc_ent, const char *name, const char **rest/*out*/,
HRETURN_ERROR (H5E_SYM, H5E_NOTFOUND, FAIL,
"no current working group");
} else if ('/' == *name) {
- *obj_ent = loc_ent->file->shared->root_grp->ent;
+ *obj_ent = H5G_rootof(loc_ent->file)->ent;
} else {
*obj_ent = *loc_ent;
}
@@ -1479,7 +1303,7 @@ H5G_close(H5G_t *grp)
assert(grp->nref > 0);
if (1 == grp->nref) {
- assert (grp!=H5G_fileof(grp)->shared->root_grp);
+ assert (grp!=H5G_rootof(H5G_fileof(grp)));
if (H5O_close(&(grp->ent)) < 0) {
HRETURN_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to close");
}
@@ -1494,188 +1318,27 @@ H5G_close(H5G_t *grp)
/*-------------------------------------------------------------------------
- * Function: H5G_set
+ * Function: H5G_rootof
*
- * Purpose: Sets the current working group to be the specified group.
- * This affects only the top item on the group stack for the
- * specified file as accessed through this file handle. If the
- * file is opened multiple times, then the current working group
- * for this file handle is the only one that is changed.
+ * Purpose: Return a pointer to the root group of the file.
*
- * Note: The group is re-opened and held open until it is removed from
- * the current working group stack.
+ * Return: Success:
*
- * Errors:
- * SYM CWG Can't open group.
- * SYM CWG Couldn't close previous c.w.g.
- * SYM CWG Not a group.
- *
- * Return: Success: SUCCEED
- *
- * Failure: FAIL
+ * Failure:
*
* Programmer: Robb Matzke
- * Wednesday, September 24, 1997
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5G_set (H5G_t *grp)
-{
- H5F_t *f;
-
- FUNC_ENTER(H5G_set, FAIL);
-
- /* check args */
- assert(grp);
- f = H5G_fileof (grp);
-
- /*
- * If there is no stack then create one, otherwise close the current
- * working group.
- */
- if (!f->cwg_stack) {
- if (NULL==(f->cwg_stack = H5MM_calloc(sizeof(H5G_cwgstk_t)))) {
- HRETURN_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,
- "memory allocation failed");
- }
- } else if (H5G_close(f->cwg_stack->grp) < 0) {
- HRETURN_ERROR(H5E_SYM, H5E_CWG, FAIL,
- "couldn't close previous current working group");
- }
- f->cwg_stack->grp = H5G_reopen (grp);
-
- FUNC_LEAVE(SUCCEED);
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: H5G_getcwg
- *
- * Purpose: Returns the current working group.
- *
- * Return: Success: The current working group. This group should
- * not* be closed with H5G_close() when the
- * caller is done with it.
- *
- * Failure: NULL
- *
- * Programmer: Robb Matzke
- * Wednesday, September 24, 1997
+ * Tuesday, October 13, 1998
*
* Modifications:
*
*-------------------------------------------------------------------------
*/
H5G_t *
-H5G_getcwg(H5F_t *f)
+H5G_rootof(H5F_t *f)
{
- H5G_t *ret_value = NULL;
-
- FUNC_ENTER(H5G_getcwg, NULL);
-
- /* check args */
- assert(f);
-
- if (f->cwg_stack) {
- ret_value = f->cwg_stack->grp;
- } else {
- ret_value = f->shared->root_grp;
- }
- FUNC_LEAVE(ret_value);
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: H5G_push
- *
- * Purpose: Pushes a new current working group onto the stack. The GRP
- * is reopened and held open until it is removed from the stack.
- *
- * Errors:
- *
- * Return: Success: SUCCEED
- *
- * Failure: FAIL
- *
- * Programmer: Robb Matzke
- * Friday, September 19, 1997
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5G_push (H5G_t *grp)
-{
- H5G_cwgstk_t *stack = NULL;
-
- FUNC_ENTER(H5G_push, FAIL);
-
- /* check args */
- assert(grp);
-
- /*
- * Push a new entry onto the stack.
- */
- if (NULL==(stack = H5MM_calloc(sizeof(H5G_cwgstk_t)))) {
- HRETURN_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,
- "memory allocation failed");
- }
- stack->grp = H5G_reopen(grp);
- stack->next = H5G_fileof(grp)->cwg_stack;
- H5G_fileof(grp)->cwg_stack = stack;
-
- FUNC_LEAVE(SUCCEED);
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: H5G_pop
- *
- * Purpose: Pops the top current working group off the stack. If the
- * stack becomes empty then the current working group is
- * implicitly the root group.
- *
- * Errors:
- *
- * Return: Success: SUCCEED
- *
- * Failure: FAIL if the stack is empty.
- *
- * Programmer: Robb Matzke
- * Friday, September 19, 1997
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5G_pop (H5F_t *f)
-{
- H5G_cwgstk_t *stack = NULL;
-
- FUNC_ENTER(H5G_pop, FAIL);
-
- /* check args */
- assert(f);
-
- if ((stack = f->cwg_stack)) {
- if (H5G_close(stack->grp) < 0) {
- HRETURN_ERROR(H5E_SYM, H5E_CWG, FAIL,
- "can't close current working group");
- }
- f->cwg_stack = stack->next;
- stack->grp = NULL;
- H5MM_xfree(stack);
- } else {
- HRETURN_ERROR(H5E_SYM, H5E_CWG, FAIL, "stack is empty");
- }
-
- FUNC_LEAVE(SUCCEED);
+ FUNC_ENTER(H5G_rootof, NULL);
+ FUNC_LEAVE(f->shared->root_grp);
}
@@ -1878,13 +1541,9 @@ H5G_loc (hid_t loc_id)
if (NULL==(f=H5I_object (loc_id))) {
HRETURN_ERROR (H5E_ARGS, H5E_BADVALUE, NULL, "invalid file ID");
}
- if (NULL==(group=H5G_getcwg (f))) {
- HRETURN_ERROR (H5E_ARGS, H5E_BADVALUE, NULL,
- "unable to get current working group");
- }
- if (NULL==(ret_value=H5G_entof(group))) {
+ if (NULL==(ret_value=H5G_entof(H5G_rootof(f)))) {
HRETURN_ERROR(H5E_ARGS, H5E_BADVALUE, NULL,
- "unable to get symbol table entry of c.w.g.");
+ "unable to get symbol table entry for root group");
}
break;
diff --git a/src/H5Gpkg.h b/src/H5Gpkg.h
index f0ee156..74573f3 100644
--- a/src/H5Gpkg.h
+++ b/src/H5Gpkg.h
@@ -56,16 +56,6 @@ struct H5G_t {
};
/*
- * Each file has a stack of open groups with the latest entry on the
- * stack the current working group. If the stack is empty then the
- * current working group is the root object.
- */
-typedef struct H5G_cwgstk_t {
- H5G_t *grp; /*a handle to an open group */
- struct H5G_cwgstk_t *next; /*next item (earlier) on stack */
-} H5G_cwgstk_t;
-
-/*
* These operations can be passed down from the H5G_stab layer to the
* H5G_node layer through the B-tree layer.
*/
diff --git a/src/H5Gprivate.h b/src/H5Gprivate.h
index 8c5f991..417f011 100644
--- a/src/H5Gprivate.h
+++ b/src/H5Gprivate.h
@@ -107,10 +107,7 @@ H5G_t *H5G_create (H5G_entry_t *loc, const char *name, size_t size_hint);
H5G_t *H5G_open (H5G_entry_t *loc, const char *name);
H5G_t *H5G_reopen (H5G_t *grp);
herr_t H5G_close (H5G_t *grp);
-herr_t H5G_set (H5G_t *grp);
-herr_t H5G_push (H5G_t *grp);
-herr_t H5G_pop (H5F_t *f);
-H5G_t *H5G_getcwg(H5F_t *f);
+H5G_t *H5G_rootof(H5F_t *f);
herr_t H5G_link (H5G_entry_t *loc, H5G_link_t type, const char *cur_name,
const char *new_name);
herr_t H5G_get_objinfo (H5G_entry_t *loc, const char *name,
diff --git a/src/H5Gpublic.h b/src/H5Gpublic.h
index d5e9a3e..cc3cc7d 100644
--- a/src/H5Gpublic.h
+++ b/src/H5Gpublic.h
@@ -59,9 +59,6 @@ typedef herr_t (*H5G_iterate_t)(hid_t group, const char *group_name,
hid_t H5Gcreate (hid_t loc_id, const char *name, size_t size_hint);
hid_t H5Gopen (hid_t loc_id, const char *name);
herr_t H5Gclose (hid_t group_id);
-herr_t H5Gset (hid_t loc_id, const char *name);
-herr_t H5Gpush (hid_t loc_id, const char *name);
-herr_t H5Gpop (hid_t loc_id);
herr_t H5Giterate (hid_t loc_id, const char *name, int *idx, H5G_iterate_t op,
void *op_data);
herr_t H5Gmove (hid_t loc_id, const char *src, const char *dst);
diff --git a/test/.distdep b/test/.distdep
index a560909..3c48c82 100644
--- a/test/.distdep
+++ b/test/.distdep
@@ -123,35 +123,6 @@ tselect.o: \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h
-tstab.o: \
- tstab.c \
- testhdf5.h \
- ../src/H5private.h \
- ../src/H5public.h \
- ../src/H5config.h \
- ../src/H5Eprivate.h \
- ../src/H5Epublic.h \
- ../src/H5Ipublic.h \
- ../src/H5Iprivate.h \
- ../src/H5ACprivate.h \
- ../src/H5ACpublic.h \
- ../src/H5Fprivate.h \
- ../src/H5Fpublic.h \
- ../src/H5Dpublic.h \
- ../src/H5Pprivate.h \
- ../src/H5Ppublic.h \
- ../src/H5Zpublic.h \
- ../src/H5Gprivate.h \
- ../src/H5Gpublic.h \
- ../src/H5Bprivate.h \
- ../src/H5Bpublic.h \
- ../src/H5Oprivate.h \
- ../src/H5Opublic.h \
- ../src/H5HGprivate.h \
- ../src/H5HGpublic.h \
- ../src/H5Tprivate.h \
- ../src/H5Tpublic.h \
- ../src/H5Sprivate.h
th5s.o: \
th5s.c \
testhdf5.h \
@@ -198,7 +169,7 @@ dtypes.o: \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
- ../src/H5RApublic.h \
+ ../src/H5Rpublic.h \
../src/H5Spublic.h \
../src/H5Tpublic.h \
../src/H5Tpkg.h \
@@ -213,34 +184,6 @@ hyperslab.o: \
../src/H5config.h \
../src/H5MMprivate.h \
../src/H5MMpublic.h
-istore.o: \
- istore.c \
- ../src/H5private.h \
- ../src/H5public.h \
- ../src/H5config.h \
- ../src/H5Dprivate.h \
- ../src/H5Dpublic.h \
- ../src/H5Ipublic.h \
- ../src/H5Fprivate.h \
- ../src/H5Fpublic.h \
- ../src/H5Gprivate.h \
- ../src/H5Gpublic.h \
- ../src/H5Bprivate.h \
- ../src/H5Bpublic.h \
- ../src/H5Oprivate.h \
- ../src/H5Opublic.h \
- ../src/H5HGprivate.h \
- ../src/H5HGpublic.h \
- ../src/H5Tprivate.h \
- ../src/H5Tpublic.h \
- ../src/H5Sprivate.h \
- ../src/H5Spublic.h \
- ../src/H5Zprivate.h \
- ../src/H5Zpublic.h \
- ../src/H5Iprivate.h \
- ../src/H5Pprivate.h \
- ../src/H5Ppublic.h \
- ../src/H5MMprivate.h
dsets.o: \
dsets.c \
../src/hdf5.h \
@@ -261,7 +204,7 @@ dsets.o: \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
- ../src/H5RApublic.h \
+ ../src/H5Rpublic.h \
../src/H5Spublic.h \
../src/H5Tpublic.h
cmpd_dset.o: \
@@ -284,7 +227,7 @@ cmpd_dset.o: \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
- ../src/H5RApublic.h \
+ ../src/H5Rpublic.h \
../src/H5Spublic.h \
../src/H5Tpublic.h
extend.o: \
@@ -307,7 +250,7 @@ extend.o: \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
- ../src/H5RApublic.h
+ ../src/H5Rpublic.h
external.o: \
external.c \
../src/hdf5.h \
@@ -328,7 +271,7 @@ external.o: \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
- ../src/H5RApublic.h \
+ ../src/H5Rpublic.h \
../src/H5Spublic.h \
../src/H5Tpublic.h
iopipe.o: \
@@ -351,7 +294,7 @@ iopipe.o: \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
- ../src/H5RApublic.h \
+ ../src/H5Rpublic.h \
../src/H5Spublic.h \
../src/H5Tpublic.h
gheap.o: \
@@ -393,31 +336,7 @@ shtype.o: \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
- ../src/H5RApublic.h
-big.o: \
- big.c \
- ../src/hdf5.h \
- ../src/H5public.h \
- ../src/H5config.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/H5RApublic.h \
- ../src/H5Spublic.h \
- ../src/H5Tpublic.h \
- ../src/H5private.h
+ ../src/H5Rpublic.h
links.o: \
links.c \
../src/hdf5.h \
@@ -438,7 +357,7 @@ links.o: \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
- ../src/H5RApublic.h \
+ ../src/H5Rpublic.h \
../src/H5Spublic.h
chunk.o: \
chunk.c \
@@ -460,7 +379,7 @@ chunk.o: \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
- ../src/H5RApublic.h \
+ ../src/H5Rpublic.h \
../src/H5Spublic.h
bittests.o: \
bittests.c \
@@ -498,12 +417,12 @@ mtime.o: \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
- ../src/H5RApublic.h \
+ ../src/H5Rpublic.h \
../src/H5Spublic.h \
../src/H5Tpublic.h \
../src/H5private.h
-ragged.o: \
- ragged.c \
+unlink.o: \
+ unlink.c \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
@@ -522,12 +441,33 @@ ragged.o: \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
- ../src/H5RApublic.h \
+ ../src/H5Rpublic.h \
+ ../src/H5Spublic.h
+overhead.o: \
+ overhead.c \
+ ../src/hdf5.h \
+ ../src/H5public.h \
+ ../src/H5config.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/H5Spublic.h \
- ../src/H5Tpublic.h \
- ../src/H5private.h
-unlink.o: \
- unlink.c \
+ ../src/H5Tpublic.h
+big.o: \
+ big.c \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
@@ -547,9 +487,11 @@ unlink.o: \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
../src/H5RApublic.h \
- ../src/H5Spublic.h
-overhead.o: \
- overhead.c \
+ ../src/H5Spublic.h \
+ ../src/H5Tpublic.h \
+ ../src/H5private.h
+ragged.o: \
+ ragged.c \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
@@ -570,7 +512,8 @@ overhead.o: \
../src/H5Zpublic.h \
../src/H5RApublic.h \
../src/H5Spublic.h \
- ../src/H5Tpublic.h
+ ../src/H5Tpublic.h \
+ ../src/H5private.h
fillval.o: \
fillval.c \
../src/hdf5.h \
@@ -594,3 +537,60 @@ fillval.o: \
../src/H5RApublic.h \
../src/H5Spublic.h \
../src/H5Tpublic.h
+tstab.o: \
+ tstab.c \
+ testhdf5.h \
+ ../src/H5private.h \
+ ../src/H5public.h \
+ ../src/H5config.h \
+ ../src/H5Eprivate.h \
+ ../src/H5Epublic.h \
+ ../src/H5Ipublic.h \
+ ../src/H5Iprivate.h \
+ ../src/H5ACprivate.h \
+ ../src/H5ACpublic.h \
+ ../src/H5Fprivate.h \
+ ../src/H5Fpublic.h \
+ ../src/H5Dpublic.h \
+ ../src/H5Pprivate.h \
+ ../src/H5Ppublic.h \
+ ../src/H5Zpublic.h \
+ ../src/H5Gprivate.h \
+ ../src/H5Gpublic.h \
+ ../src/H5Bprivate.h \
+ ../src/H5Bpublic.h \
+ ../src/H5Oprivate.h \
+ ../src/H5Opublic.h \
+ ../src/H5HGprivate.h \
+ ../src/H5HGpublic.h \
+ ../src/H5Tprivate.h \
+ ../src/H5Tpublic.h \
+ ../src/H5Sprivate.h
+istore.o: \
+ istore.c \
+ ../src/H5private.h \
+ ../src/H5public.h \
+ ../src/H5config.h \
+ ../src/H5Dprivate.h \
+ ../src/H5Dpublic.h \
+ ../src/H5Ipublic.h \
+ ../src/H5Fprivate.h \
+ ../src/H5Fpublic.h \
+ ../src/H5Gprivate.h \
+ ../src/H5Gpublic.h \
+ ../src/H5Bprivate.h \
+ ../src/H5Bpublic.h \
+ ../src/H5Oprivate.h \
+ ../src/H5Opublic.h \
+ ../src/H5HGprivate.h \
+ ../src/H5HGpublic.h \
+ ../src/H5Tprivate.h \
+ ../src/H5Tpublic.h \
+ ../src/H5Sprivate.h \
+ ../src/H5Spublic.h \
+ ../src/H5Zprivate.h \
+ ../src/H5Zpublic.h \
+ ../src/H5Iprivate.h \
+ ../src/H5Pprivate.h \
+ ../src/H5Ppublic.h \
+ ../src/H5MMprivate.h
diff --git a/test/istore.c b/test/istore.c
index 468ee01..6f73d82 100644
--- a/test/istore.c
+++ b/test/istore.c
@@ -135,7 +135,7 @@ new_object(H5F_t *f, const char *name, intn ndims, H5G_entry_t *ent/*out*/)
return -1;
}
/* Give the object header a name */
- if (H5G_insert(H5G_entof(H5G_getcwg(f)), name, ent) < 0) {
+ if (H5G_insert(H5G_entof(H5G_rootof(f)), name, ent) < 0) {
printf("*FAILED*\n");
if (!isatty(1)) {
AT();
@@ -639,7 +639,7 @@ main(int argc, char *argv[])
* By creating a group we cause the library to emit it's debugging
* diagnostic messages before we begin testing...
*/
- dir = H5G_create(H5G_entof(H5G_getcwg(f)), "flushing_diagnostics", 0);
+ dir = H5G_create(H5G_entof(H5G_rootof(f)), "flushing_diagnostics", 0);
H5G_close(dir);
dir = NULL;
diff --git a/test/tstab.c b/test/tstab.c
index 64dced5..52bc8cb 100644
--- a/test/tstab.c
+++ b/test/tstab.c
@@ -52,7 +52,7 @@ static void
test_1(void)
{
hid_t file;
- hid_t g1, g2, g3, g4;
+ hid_t g1, g2, g3;
herr_t status;
char comment[64];
int cmp;
@@ -64,17 +64,13 @@ test_1(void)
g1 = H5Gcreate(file, "test_1a", 0);
CHECK_I(g1, "H5Gcreate");
- status = H5Gset(file, "test_1a");
g2 = H5Gcreate(g1, "sub_1", 0);
CHECK_I(g2, "H5Gcreate");
- g3 = H5Gcreate(file, "sub_2", 0);
+
+ g3 = H5Gcreate(file, "test_1b", 0);
CHECK_I(g3, "H5Gcreate");
-
- H5Gpop(g3);
- g4 = H5Gcreate(file, "test_1b", 0);
- CHECK_I(g4, "H5Gcreate");
- status = H5Gset_comment(g4, ".", "hello world");
+ status = H5Gset_comment(g3, ".", "hello world");
CHECK_I(status, "H5Gset_comment");
/* Close all groups */
@@ -84,19 +80,15 @@ test_1(void)
CHECK_I(status, "H5Gclose");
status = H5Gclose(g3);
CHECK_I(status, "H5Gclose");
- status = H5Gclose(g4);
- CHECK_I(status, "H5Gclose");
/* Open all groups with absolute names to check for exsistence */
g1 = H5Gopen(file, "/test_1a");
CHECK_I(g1, "H5Gopen");
g2 = H5Gopen(file, "/test_1a/sub_1");
CHECK_I(g2, "H5Gopen");
- g3 = H5Gopen(file, "/test_1a/sub_2");
+ g3 = H5Gopen(file, "/test_1b");
CHECK_I(g3, "H5Gopen");
- g4 = H5Gopen(file, "/test_1b");
- CHECK_I(g4, "H5Gopen");
- status = H5Gget_comment(g4, "././.", sizeof comment, comment);
+ status = H5Gget_comment(g3, "././.", sizeof comment, comment);
CHECK_I(status, "H5Gget_comment");
cmp = strcmp(comment, "hello world");
VERIFY(cmp, 0, "strcmp");
@@ -108,8 +100,6 @@ test_1(void)
CHECK_I(status, "H5Gclose");
status = H5Gclose(g3);
CHECK_I(status, "H5Gclose");
- status = H5Gclose(g4);
- CHECK_I(status, "H5Gclose");
/* Close file */
status = H5Fclose(file);
@@ -135,12 +125,12 @@ test_1(void)
static void
test_2(void)
{
- hid_t fid, create_plist, access_plist, dir;
- H5F_t *f;
- int i;
- char name[256];
- herr_t status;
- int nsyms = 5000;
+ hid_t fid, cwg, create_plist, access_plist, dir;
+ H5F_t *f;
+ int i;
+ char name[256];
+ herr_t status;
+ int nsyms = 5000;
MESSAGE(2, ("........large directories\n"));
@@ -189,22 +179,21 @@ test_2(void)
* Create a directory that has so many entries that the root
* of the B-tree ends up splitting.
*/
- dir = H5Gcreate(fid, "/big", (size_t)nsyms*16+2);
- CHECK_I(dir, "H5Gcreate");
- status = H5Gclose(dir);
- CHECK_I(status, "H5Gclose");
- status = H5Gset(fid, "/big");
- CHECK_I(status, "H5Gset");
+ cwg = H5Gcreate(fid, "/big", (size_t)nsyms*16+2);
+ CHECK_I(cwg, "H5Gcreate");
for (i = 0; i < nsyms; i++) {
sprintf(name, "%05d%05d", rand() % 100000, i);
MESSAGE(8, ("%s\n", name));
- dir = H5Gcreate(fid, name, 0);
+ dir = H5Gcreate(cwg, name, 0);
CHECK_I(dir, "H5Gcreate");
status = H5Gclose(dir);
CHECK_I(status, "H5Gclose");
}
+ status = H5Gclose(cwg);
+ CHECK_I(status, "H5Gclose");
+
/* close the property lists */
status = H5Pclose(create_plist);
CHECK_I(status, "H5Pclose");
diff --git a/tools/Makefile.in b/tools/Makefile.in
index d6ea8c9..8c401ac 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -27,7 +27,7 @@ PROG_OBJ=$(PROG_SRC:.c=.o)
PRIVATE_HDR=h5tools.h
# Programs have to be built before they can be tested!
-test: $(PROGS)
+test _test: $(PROGS)
# How to build the programs...
h5debug: h5debug.o $(LIB) ../src/libhdf5.a