[svn-r1549] Changes since 19990728

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

./src/H5B.c		[1.3]
./src/H5D.c		[1.3]
./src/H5F.c		[1.3]
./src/H5Farray.c	[1.3]
./src/H5Fcore.c		[1.3]
./src/H5Ffamily.c	[1.3]
./src/H5Fistore.c	[1.3]
./src/H5Flow.c		[1.3]
./src/H5Fmpio.c		[1.3]
./src/H5Fprivate.h	[1.3]
./src/H5Fsplit.c	[1.3]
./src/H5Fstdio.c	[1.3]
./src/H5G.c		[1.3]
./src/H5HG.c		[1.3]
./src/H5HL.c		[1.3]
./src/H5MF.c		[1.3]
./src/H5O.c		[1.3]
./src/H5Odtype.c	[1.3]
./src/H5Oefl.c		[1.3]
./src/H5P.c		[1.3]
./src/H5Smpio.c		[1.3]
./src/H5T.c		[1.3]
./src/H5detect.c	[1.3]
./tools/h5debug.c	[1.3]
	Some of the H5F_addr_* functions were optimized away.

./src/H5D.c		[1.3]
	Fixed the return values from NULL to FAIL on one MPI-IO
	function.

1 files changed, 6 insertions, 12 deletions

diff --git a/src/H5Ffamily.c b/src/H5Ffamily.c
index d871e69..ac50541 100644
--- a/src/H5Ffamily.c
+++ b/src/H5Ffamily.c
@@ -327,7 +327,6 @@ H5F_fam_read(H5F_low_t *lf, const H5F_access_t *access_parms,
 
     member_size = lf->u.fam.memb_size;
     membno = H5F_FAM_MEMBNO(lf, addr);
-    H5F_addr_reset (&offset);
     offset = H5F_FAM_OFFSET(lf, addr);
     cur_addr = addr;
 
@@ -347,7 +346,7 @@ H5F_fam_read(H5F_low_t *lf, const H5F_access_t *access_parms,
 	    buf += nbytes;
 	    size -= nbytes;
 	    membno++;
-	    H5F_addr_reset (&offset);
+	    offset = 0;
 	}
     }
 
@@ -404,7 +403,6 @@ H5F_fam_write(H5F_low_t *lf, const H5F_access_t *access_parms,
     memb_type = H5F_low_class (access_parms->u.fam.memb_access->driver);
     member_size = lf->u.fam.memb_size;
     membno = H5F_FAM_MEMBNO(lf, addr);
-    H5F_addr_reset (&offset);
     offset = H5F_FAM_OFFSET(lf, addr);
     cur_addr = addr;
 
@@ -444,8 +442,7 @@ H5F_fam_write(H5F_low_t *lf, const H5F_access_t *access_parms,
 		 * maximum possible value.
 		 */
 		if (i < membno) {
-		    H5F_addr_reset(&max_addr);
-		    H5F_addr_inc(&max_addr, member_size);
+		    max_addr = member_size;
 		    H5F_low_seteof(member, max_addr);
 		}
 		lf->u.fam.memb[lf->u.fam.nmemb++] = member;
@@ -456,8 +453,7 @@ H5F_fam_write(H5F_low_t *lf, const H5F_access_t *access_parms,
 	 * Make sure the logical eof is large enough to handle the request.
 	 * Do not decrease the EOF
 	 */
-	max_addr = cur_addr;
-	H5F_addr_inc(&max_addr, (hsize_t)nbytes);
+	max_addr = cur_addr + (hsize_t)nbytes;
 	if (H5F_addr_gt(max_addr, lf->u.fam.memb[membno]->eof)) {
 	    H5F_low_seteof(lf->u.fam.memb[membno], max_addr);
 	}
@@ -472,7 +468,7 @@ H5F_fam_write(H5F_low_t *lf, const H5F_access_t *access_parms,
 	buf += nbytes;
 	size -= nbytes;
 	membno++;
-	H5F_addr_reset (&offset);
+	offset = 0;
     }
 
     FUNC_LEAVE(SUCCEED);
@@ -514,11 +510,9 @@ H5F_fam_flush(H5F_low_t *lf, const H5F_access_t *access_parms)
      * end of the member) and then writing it back.
      */
     max_offset = lf->u.fam.memb_size - 1;
-    H5F_addr_reset(&addr1);
-    H5F_addr_inc(&addr1, max_offset);
+    addr1 = max_offset;
     H5F_low_size(lf->u.fam.memb[0], &addr2/*out*/);/*remember logical eof */
-    addr3 = addr1;
-    H5F_addr_inc(&addr3, (hsize_t)1);
+    addr3 = addr1 + 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,
 		     &H5F_xfer_dflt, addr1, 1, buf) < 0) {