[svn-r1216] Changes since 19990423

----------------------

./src/H5B.c
./src/H5D.c
./src/H5F.c
./src/H5Farray.c
./src/H5Fcore.c
./src/H5Ffamily.c
./src/H5Fistore.c
./src/H5Flow.c
./src/H5Fmpio.c
./src/H5Fprivate.h
./src/H5Fsec2.c
./src/H5Fsplit.c
./src/H5Fstdio.c
./src/H5Gnode.c
./src/H5HG.c
./src/H5HL.c
./src/H5O.c
        Changed H5F_block_read/write() to take a file transfer
        property list instead of just a parallel I/O mode. This will
        allow us to pass additional parameters to the I/O functions
        without having so many arguments to worry about.

        This fixes a bug I introduced last Friday for parallel HDF5

./src/H5B.c
        Fixed decoding of B-tree keys when iterating through the
        leaves of the B-tree. This fixes a bug for applications that are
        adding new entries to groups and also listing the groups.

1 files changed, 12 insertions, 13 deletions

diff --git a/src/H5Ffamily.c b/src/H5Ffamily.c
index 46f9b6a..f2fa689 100644
--- a/src/H5Ffamily.c
+++ b/src/H5Ffamily.c
@@ -43,12 +43,11 @@ static H5F_low_t *H5F_fam_open(const char *name,
 			       H5F_search_t *key/*out*/);
 static herr_t H5F_fam_close(H5F_low_t *lf, const H5F_access_t *access_parms);
 static herr_t H5F_fam_read(H5F_low_t *lf, const H5F_access_t *access_parms,
-			   const H5D_transfer_t xfer_mode,
-			   const haddr_t *addr, size_t size, uint8_t *buf);
+			   const H5F_xfer_t *xfer_parms, const haddr_t *addr,
+			   size_t size, uint8_t *buf);
 static herr_t H5F_fam_write(H5F_low_t *lf, const H5F_access_t *access_parms,
-			    const H5D_transfer_t xfer_mode,
-			    const haddr_t *addr, size_t size,
-			    const uint8_t *buf);
+			    const H5F_xfer_t *xfer_parms, const haddr_t *addr,
+			    size_t size, const uint8_t *buf);
 static herr_t H5F_fam_flush(H5F_low_t *lf, const H5F_access_t *access_parms);
 
 const H5F_low_class_t H5F_LOW_FAMILY_g[1] = {{
@@ -313,8 +312,8 @@ H5F_fam_close(H5F_low_t *lf, const H5F_access_t *access_parms)
  */
 static herr_t
 H5F_fam_read(H5F_low_t *lf, const H5F_access_t *access_parms,
-	     const H5D_transfer_t xfer_mode,
-	     const haddr_t *addr, size_t size, uint8_t *buf)
+	     const H5F_xfer_t *xfer_parms, const haddr_t *addr,
+	     size_t size, uint8_t *buf)
 {
     size_t		nbytes;
     haddr_t		cur_addr;
@@ -341,7 +340,7 @@ H5F_fam_read(H5F_low_t *lf, const H5F_access_t *access_parms,
 	    nbytes = MIN(size, member_size.offset-offset.offset);
 	    cur_addr = offset;
 	    if (H5F_low_read(lf->u.fam.memb[membno],
-			     access_parms->u.fam.memb_access, xfer_mode,
+			     access_parms->u.fam.memb_access, xfer_parms,
 			     &cur_addr, nbytes, buf) < 0) {
 		HRETURN_ERROR(H5E_IO, H5E_READERROR, FAIL,
 			      "can't read from family member");
@@ -378,8 +377,8 @@ H5F_fam_read(H5F_low_t *lf, const H5F_access_t *access_parms,
  */
 static herr_t
 H5F_fam_write(H5F_low_t *lf, const H5F_access_t *access_parms,
-	      const H5D_transfer_t xfer_mode,
-	      const haddr_t *addr, size_t size, const uint8_t *buf)
+	      const H5F_xfer_t *xfer_parms, const haddr_t *addr,
+	      size_t size, const uint8_t *buf)
 {
     size_t		   	nbytes;
     haddr_t		    	cur_addr, max_addr;
@@ -464,7 +463,7 @@ H5F_fam_write(H5F_low_t *lf, const H5F_access_t *access_parms,
 	
 	/* Write the data to the member */
 	if (H5F_low_write(lf->u.fam.memb[membno],
-			  access_parms->u.fam.memb_access, xfer_mode,
+			  access_parms->u.fam.memb_access, xfer_parms,
 			  &cur_addr, nbytes, buf) < 0) {
 	    HRETURN_ERROR(H5E_IO, H5E_WRITEERROR, FAIL,
 			  "can't write to family member");
@@ -521,12 +520,12 @@ H5F_fam_flush(H5F_low_t *lf, const H5F_access_t *access_parms)
     H5F_addr_inc(&addr3, (hsize_t)1);
     H5F_low_seteof(lf->u.fam.memb[0], &addr3);	/*prevent a warning */
     if (H5F_low_read(lf->u.fam.memb[0], access_parms->u.fam.memb_access,
-		     H5D_XFER_DFLT, &addr1, 1, buf) < 0) {
+		     &H5F_xfer_dflt, &addr1, 1, buf) < 0) {
 	HRETURN_ERROR(H5E_IO, H5E_READERROR, FAIL,
 		      "can't read from first family member");
     }
     if (H5F_low_write(lf->u.fam.memb[0], access_parms->u.fam.memb_access,
-		      H5D_XFER_DFLT, &addr1, 1, buf) < 0) {
+		      &H5F_xfer_dflt, &addr1, 1, buf) < 0) {
 	HRETURN_ERROR(H5E_IO, H5E_WRITEERROR, FAIL,
 		      "can't write to first family member");
     }