[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...

3 files changed, 122 insertions, 133 deletions

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");