[svn-r100] Interim checkin for purify. Also contains H5G shadow stuff, changes

to int64 encode/decode to fix purify on 32-bit systems, changes to
H5O_modify, changes to H5D.c to use H5F_open/close(), etc.
Documentation will be mailed shortly...

4 files changed, 15 insertions, 13 deletions

diff --git a/test/Makefile.in b/test/Makefile.in
index 339ebc3..8a7d4f0 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -22,6 +22,6 @@ PRIVATE_HDR=testhdf5.h
 
 # How to build the programs...
 testhdf5: $(PROG_OBJ) ../src/libhdf5.a
-	$(CC) $(CFLAGS) -o $@ $(PROG_OBJ) ../src/libhdf5.a
+	$(CC) $(CFLAGS) -o $@ $(PROG_OBJ) ../src/libhdf5.a $(LIBS)
 
 @CONCLUDE@
diff --git a/test/th5d.c b/test/th5d.c
index 604aaef..90e1234 100644
--- a/test/th5d.c
+++ b/test/th5d.c
@@ -107,7 +107,7 @@ static void test_h5d_basic_write(void)
     CHECK(ret,FAIL,"H5Tset_type");
     
     did1=H5Mcreate(fid1,H5_DATASET,DATA1_NAME);
-    CHECK(sid1,FAIL,"H5Mcreate");
+    CHECK(did1,FAIL,"H5Mcreate");
 
     ret=H5Dset_info(did1,tid1,sid1);
     CHECK(ret,FAIL,"H5Dset_info");
diff --git a/test/tohdr.c b/test/tohdr.c
index fc19d4e..b3a0b10 100644
--- a/test/tohdr.c
+++ b/test/tohdr.c
@@ -48,7 +48,6 @@ test_ohdr (void)
    herr_t	status;
    void		*ptr;
    H5G_entry_t	ent;
-   hbool_t	ent_mod;
    int		i;
    
    MESSAGE (5, ("Testing Object Headers\n"));
@@ -69,7 +68,7 @@ test_ohdr (void)
    MESSAGE (8, ("Creating new message...\n"));
    stab.btree_addr = 11111111;
    stab.heap_addr  = 22222222;
-   status = H5O_modify (f, oh, NULL, NULL, H5O_STAB, H5O_NEW_MESG, &stab);
+   status = H5O_modify (f, oh, NULL, H5O_STAB, H5O_NEW_MESG, &stab);
    VERIFY (status, 0, "H5O_modify");
 
    H5AC_flush (f, NULL, 0, TRUE);
@@ -85,7 +84,7 @@ test_ohdr (void)
    MESSAGE (8, ("Modifying message...\n"));
    stab.btree_addr = 33333333;
    stab.heap_addr  = 44444444;
-   status = H5O_modify (f, oh, NULL, NULL, H5O_STAB, 0, &stab);
+   status = H5O_modify (f, oh, NULL, H5O_STAB, 0, &stab);
    VERIFY (status, 0, "H5O_modify");
 
    H5AC_flush (f, NULL, 0, TRUE);
@@ -102,11 +101,12 @@ test_ohdr (void)
    MESSAGE (8, ("Creating a duplicate message...\n"));
    ent.header = 0;
    ent.type = H5G_NOTHING_CACHED;
+   ent.dirty = FALSE;
    stab.btree_addr = 55555555;
    stab.heap_addr  = 66666666;
-   status = H5O_modify (f, oh, &ent, &ent_mod, H5O_STAB, H5O_NEW_MESG, &stab);
+   status = H5O_modify (f, oh, &ent, H5O_STAB, H5O_NEW_MESG, &stab);
    VERIFY (status, 1, "H5O_modify");
-   VERIFY (ent_mod, TRUE, "H5O_modify");
+   VERIFY (ent.dirty, TRUE, "H5O_modify");
    VERIFY (ent.type, H5G_CACHED_STAB, "H5O_modify");
    VERIFY (ent.cache.stab.heap_addr, stab.heap_addr, "H5O_modify");
    VERIFY (ent.cache.stab.btree_addr, stab.btree_addr, "H5O_modify");
@@ -122,11 +122,12 @@ test_ohdr (void)
     * Test modification of the second message with a symbol table.
     */
    MESSAGE (8, ("Modifying the duplicate message...\n"));
+   ent.dirty = FALSE;
    stab.btree_addr = 77777777;
    stab.heap_addr  = 88888888;
-   status = H5O_modify (f, oh, &ent, &ent_mod, H5O_STAB, 1, &stab);
+   status = H5O_modify (f, oh, &ent, H5O_STAB, 1, &stab);
    VERIFY (status, 1, "H5O_modify");
-   VERIFY (ent_mod, TRUE, "H5O_modify");
+   VERIFY (ent.dirty, TRUE, "H5O_modify");
    VERIFY (ent.type, H5G_CACHED_STAB, "H5O_modify");
    VERIFY (ent.cache.stab.heap_addr, stab.heap_addr, "H5O_modify");
    VERIFY (ent.cache.stab.btree_addr, stab.btree_addr, "H5O_modify");
@@ -146,7 +147,7 @@ test_ohdr (void)
    for (i=0; i<40; i++) {
       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);
+      status = H5O_modify (f, oh, NULL, H5O_STAB, H5O_NEW_MESG, &stab);
       VERIFY (status, 2+i, "H5O_modify");
    }
    H5AC_flush (f, NULL, 0, TRUE);
@@ -159,7 +160,7 @@ test_ohdr (void)
    for (i=0; i<10; i++) {
       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);
+      status = H5O_modify (f, oh, NULL, H5O_STAB, H5O_NEW_MESG, &stab);
       VERIFY (status, 42+i, "H5O_modify");
       H5AC_flush (f, NULL, 0, TRUE);
    }
@@ -167,7 +168,7 @@ test_ohdr (void)
    /*
     * Delete all symbol table messages.
     */
-   status = H5O_remove (f, oh, NULL, NULL, H5O_STAB, H5O_ALL);
+   status = H5O_remove (f, oh, NULL, H5O_STAB, H5O_ALL);
    CHECK_I (status, "H5O_remove");
 
    /* close the file */
diff --git a/test/tstab.c b/test/tstab.c
index 4e6c21e..d525758 100644
--- a/test/tstab.c
+++ b/test/tstab.c
@@ -65,6 +65,7 @@ test_1 (void)
    CHECK (f, NULL, "H5Aatom_object");
 
    /* create the object */
+   memset (&ent, 0, sizeof(ent));
    ent.header = H5O_new (f, 0, 64);
    CHECK_I (ent.header, "H5O_new");
    ent.type = H5G_NOTHING_CACHED;
@@ -152,7 +153,7 @@ test_1 (void)
    CHECK_PTR (status_ptr, "H5O_read");
    CHECK_PTR (name_mesg.s, "H5O_read");
    VERIFY (strcmp(name_mesg.s, "foo"), 0, "H5O_read");
-
+   if (status_ptr) H5O_reset (H5O_NAME, &name_mesg); /*free message data*/
 
 
    /*