From 2a7ec85d6bb3106e893170578e00eac554a1f71e Mon Sep 17 00:00:00 2001 From: Robb Matzke Date: Wed, 10 Sep 1997 14:58:12 -0500 Subject: [svn-r72] *** empty log message *** --- MANIFEST | 24 ++++++++++++++++-------- config/freebsd2.2.1 | 4 +--- config/linux | 4 +--- test/tohdr.c | 48 ++++++++++++++++++++++++------------------------ test/tstab.c | 7 ++++--- 5 files changed, 46 insertions(+), 41 deletions(-) diff --git a/MANIFEST b/MANIFEST index 1a1bfaa..a9a731c 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,14 +1,18 @@ ./Changes +./INSTALL +./INSTALL_MAINT +./MANIFEST ./Makefile.in +./bin/checkposix ./bin/config.guess ./bin/config.sub +./bin/errors ./bin/install-sh ./config/commence.in ./config/conclude.in ./config/depend.in ./config/freebsd2.2.1 ./config/linux -./configure ./configure.in ./html/H5.api_map.html ./html/H5.apiv2.html @@ -20,14 +24,12 @@ ./html/heap.txt ./html/move.html ./src/H5.c -./src/H5private.h -./src/H5public.h ./src/H5A.c -./src/H5Aprivate.h -./src/H5Apublic.h ./src/H5AC.c ./src/H5ACprivate.h ./src/H5ACpublic.h +./src/H5Aprivate.h +./src/H5Apublic.h ./src/H5B.c ./src/H5Bprivate.h ./src/H5Bpublic.h @@ -51,28 +53,33 @@ ./src/H5Hprivate.h ./src/H5Hpublic.h ./src/H5M.c -./src/H5Mprivate.h -./src/H5Mpublic.h ./src/H5MF.c ./src/H5MFprivate.h ./src/H5MFpublic.h ./src/H5MM.c ./src/H5MMprivate.h ./src/H5MMpublic.h +./src/H5Mprivate.h +./src/H5Mpublic.h ./src/H5O.c ./src/H5Ocont.c ./src/H5Oname.c ./src/H5Onull.c -./src/H5Ostab.c ./src/H5Oprivate.h ./src/H5Opublic.h +./src/H5Osdim.c +./src/H5Osdtyp.c +./src/H5Ostab.c ./src/H5P.c ./src/H5Pprivate.h ./src/H5Ppublic.h ./src/H5T.c ./src/H5Tprivate.h ./src/H5Tpublic.h +./src/H5config.h ./src/H5config.h.in +./src/H5private.h +./src/H5public.h ./src/Makefile.in ./src/Naming-Conventions ./src/debug.c @@ -81,6 +88,7 @@ ./test/testhdf5.c ./test/testhdf5.h ./test/tfile.c +./test/th5t.c ./test/theap.c ./test/tmeta.c ./test/tohdr.c diff --git a/config/freebsd2.2.1 b/config/freebsd2.2.1 index 681f7a9..4d83367 100644 --- a/config/freebsd2.2.1 +++ b/config/freebsd2.2.1 @@ -1,7 +1,5 @@ # Site configuration -- do not distribute this file. if test "x$CFLAGS" = "x"; then - CFLAGS="-g -Wall -Wshadow -Wpointer-arith -Wcast-qual -Wwrite-strings \ - -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations \ - -Wnested-externs" + CFLAGS="-g -DH5AC_DEBUG_PROTECT -Wall -Wshadow -Wpointer-arith -Wcast-qual -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs" fi diff --git a/config/linux b/config/linux index 4a7778e..bf4b791 100644 --- a/config/linux +++ b/config/linux @@ -1,8 +1,6 @@ # Site configuration -- do not distribute this file. if test "x$CFLAGS" = "x"; then - CFLAGS="-g -Wall -Wshadow -Wpointer-arith -Wcast-qual -Wwrite-strings \ - -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations \ - -Wnested-externs" + CFLAGS="-g -DH5AC_DEBUG_PROTECT -Wall -Wshadow -Wpointer-arith -Wcast-qual -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs" fi diff --git a/test/tohdr.c b/test/tohdr.c index 2fd8279..fc19d4e 100644 --- a/test/tohdr.c +++ b/test/tohdr.c @@ -67,8 +67,8 @@ test_ohdr (void) * Test creation of a new message. */ MESSAGE (8, ("Creating new message...\n")); - stab.btree = 11111111; - stab.heap = 22222222; + stab.btree_addr = 11111111; + stab.heap_addr = 22222222; status = H5O_modify (f, oh, NULL, NULL, H5O_STAB, H5O_NEW_MESG, &stab); VERIFY (status, 0, "H5O_modify"); @@ -76,15 +76,15 @@ test_ohdr (void) ptr = H5O_read (f, oh, NULL, H5O_STAB, 0, &ro); CHECK_PTR (ptr, "H5O_read"); VERIFY (ptr, &ro, "H5O_read"); - VERIFY (ro.btree, stab.btree, "H5O_read"); - VERIFY (ro.heap, stab.heap, "H5O_read"); + VERIFY (ro.btree_addr, stab.btree_addr, "H5O_read"); + VERIFY (ro.heap_addr, stab.heap_addr, "H5O_read"); /* * Test modification of an existing message. */ MESSAGE (8, ("Modifying message...\n")); - stab.btree = 33333333; - stab.heap = 44444444; + stab.btree_addr = 33333333; + stab.heap_addr = 44444444; status = H5O_modify (f, oh, NULL, NULL, H5O_STAB, 0, &stab); VERIFY (status, 0, "H5O_modify"); @@ -92,8 +92,8 @@ test_ohdr (void) ptr = H5O_read (f, oh, NULL, H5O_STAB, 0, &ro); CHECK_PTR (ptr, "H5O_read"); VERIFY (ptr, &ro, "H5O_read"); - VERIFY (ro.btree, stab.btree, "H5O_read"); - VERIFY (ro.heap, stab.heap, "H5O_read"); + VERIFY (ro.btree_addr, stab.btree_addr, "H5O_read"); + VERIFY (ro.heap_addr, stab.heap_addr, "H5O_read"); /* * Test creation of a second message of the same type with a symbol @@ -102,41 +102,41 @@ test_ohdr (void) MESSAGE (8, ("Creating a duplicate message...\n")); ent.header = 0; ent.type = H5G_NOTHING_CACHED; - stab.btree = 55555555; - stab.heap = 66666666; + stab.btree_addr = 55555555; + stab.heap_addr = 66666666; status = H5O_modify (f, oh, &ent, &ent_mod, H5O_STAB, H5O_NEW_MESG, &stab); VERIFY (status, 1, "H5O_modify"); VERIFY (ent_mod, TRUE, "H5O_modify"); VERIFY (ent.type, H5G_CACHED_STAB, "H5O_modify"); - VERIFY (ent.cache.stab.heap, stab.heap, "H5O_modify"); - VERIFY (ent.cache.stab.btree, stab.btree, "H5O_modify"); + VERIFY (ent.cache.stab.heap_addr, stab.heap_addr, "H5O_modify"); + VERIFY (ent.cache.stab.btree_addr, stab.btree_addr, "H5O_modify"); H5AC_flush (f, NULL, 0, TRUE); ptr = H5O_read (f, oh, NULL, H5O_STAB, 1, &ro); CHECK_PTR (ptr, "H5O_read"); VERIFY (ptr, &ro, "H5O_read"); - VERIFY (ro.btree, stab.btree, "H5O_read"); - VERIFY (ro.heap, stab.heap, "H5O_read"); + VERIFY (ro.btree_addr, stab.btree_addr, "H5O_read"); + VERIFY (ro.heap_addr, stab.heap_addr, "H5O_read"); /* * Test modification of the second message with a symbol table. */ MESSAGE (8, ("Modifying the duplicate message...\n")); - stab.btree = 77777777; - stab.heap = 88888888; + stab.btree_addr = 77777777; + stab.heap_addr = 88888888; status = H5O_modify (f, oh, &ent, &ent_mod, H5O_STAB, 1, &stab); VERIFY (status, 1, "H5O_modify"); VERIFY (ent_mod, TRUE, "H5O_modify"); VERIFY (ent.type, H5G_CACHED_STAB, "H5O_modify"); - VERIFY (ent.cache.stab.heap, stab.heap, "H5O_modify"); - VERIFY (ent.cache.stab.btree, stab.btree, "H5O_modify"); + VERIFY (ent.cache.stab.heap_addr, stab.heap_addr, "H5O_modify"); + VERIFY (ent.cache.stab.btree_addr, stab.btree_addr, "H5O_modify"); H5AC_flush (f, NULL, 0, TRUE); ptr = H5O_read (f, oh, NULL, H5O_STAB, 1, &ro); CHECK_PTR (ptr, "H5O_read"); VERIFY (ptr, &ro, "H5O_read"); - VERIFY (ro.btree, stab.btree, "H5O_read"); - VERIFY (ro.heap, stab.heap, "H5O_read"); + VERIFY (ro.btree_addr, stab.btree_addr, "H5O_read"); + VERIFY (ro.heap_addr, stab.heap_addr, "H5O_read"); /* * Test creation of a bunch of messages one after another to see @@ -144,8 +144,8 @@ test_ohdr (void) */ MESSAGE (8, ("Overflowing header in core...\n")); for (i=0; i<40; i++) { - stab.btree = (i+1)*1000 + 1; - stab.heap = (i+1)*1000 + 2; + stab.btree_addr = (i+1)*1000 + 1; + stab.heap_addr = (i+1)*1000 + 2; status = H5O_modify (f, oh, NULL, NULL, H5O_STAB, H5O_NEW_MESG, &stab); VERIFY (status, 2+i, "H5O_modify"); } @@ -157,8 +157,8 @@ test_ohdr (void) */ MESSAGE (8, ("Overflowing header on disk...\n")); for (i=0; i<10; i++) { - stab.btree = (i+1)*1000 + 10; - stab.heap = (i+1)*1000 + 20; + stab.btree_addr = (i+1)*1000 + 10; + stab.heap_addr = (i+1)*1000 + 20; status = H5O_modify (f, oh, NULL, NULL, H5O_STAB, H5O_NEW_MESG, &stab); VERIFY (status, 42+i, "H5O_modify"); H5AC_flush (f, NULL, 0, TRUE); diff --git a/test/tstab.c b/test/tstab.c index 6165405..4e6c21e 100644 --- a/test/tstab.c +++ b/test/tstab.c @@ -201,8 +201,8 @@ test_1 (void) VERIFY (status_ptr, NULL, "H5O_read [didn't fail but should have]"); /* close the file */ - H5Fclose (fid); - + status = H5Fclose (fid); + CHECK_I (status, "H5Fclose"); } @@ -268,7 +268,8 @@ test_2 (void) /* close the file */ - H5Fclose (fid); + status = H5Fclose (fid); + CHECK_I (status, "H5Fclose"); } -- cgit v0.12