[svn-r1548] Changes since 19990727

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

./src/H5.c		[1.3]
./src/H5AC.c		[1.3]
./src/H5ACprivate.h	[1.3]
./src/H5B.c		[1.3]
./src/H5Bprivate.h	[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/H5Fsec2.c		[1.3]
./src/H5Fsplit.c	[1.3]
./src/H5Fstdio.c	[1.3]
./src/H5G.c		[1.3]
./src/H5Gent.c		[1.3]
./src/H5Gnode.c		[1.3]
./src/H5Gprivate.h	[1.3]
./src/H5Gstab.c		[1.3]
./src/H5HG.c		[1.3]
./src/H5HGprivate.h	[1.3]
./src/H5HL.c		[1.3]
./src/H5HLprivate.h	[1.3]
./src/H5MF.c		[1.3]
./src/H5MFprivate.h	[1.3]
./src/H5O.c		[1.3]
./src/H5Oattr.c		[1.3]
./src/H5Ocont.c		[1.3]
./src/H5Odtype.c	[1.3]
./src/H5Oefl.c		[1.3]
./src/H5Olayout.c	[1.3]
./src/H5Oprivate.h	[1.3]
./src/H5Oshared.c	[1.3]
./src/H5Ostab.c		[1.3]
./src/H5P.c		[1.3]
./src/H5R.c		[1.3]
./src/H5Smpio.c		[1.3]
./src/H5T.c		[1.3]
./src/H5Tvlen.c		[1.3]
./src/H5private.h	[1.3]
./test/dtypes.c		[1.3]
./test/gheap.c		[1.3]
./test/istore.c		[1.3]
./test/lheap.c		[1.3]
./test/ohdr.c		[1.3]
./tools/h5debug.c	[1.3]
	File addresses (the `haddr_t' type) are passed by value
	instead of by reference. The type is no longer a struct. This
	is one of the preliminary changes needed for the Virtual File
	Layer stuff.

./src/H5Fprivate.h	[1.3]
./src/H5Flow.c		[1.3]
	Some address functions were rewritten as macros.

1 files changed, 11 insertions, 12 deletions

diff --git a/src/H5.c b/src/H5.c
index d096a16..b2f12b2 100644
--- a/src/H5.c
+++ b/src/H5.c
@@ -519,10 +519,7 @@ HDvsnprintf(char *buf, size_t size, const char *fmt, va_list ap)
  *		prints an `hsize_t' value as a hex number right justified and
  *		zero filled in an 18-character field.
  *
- *		The conversion `a' refers to an `haddr_t*' type.
- *
- * Bugs:	Return value will be incorrect if `%a' appears in the format
- *		string.
+ *		The conversion `a' refers to an `haddr_t' type.
  *
  * Return:	Success:	Number of characters printed
  *
@@ -532,7 +529,9 @@ HDvsnprintf(char *buf, size_t size, const char *fmt, va_list ap)
  *              Thursday, April  9, 1998
  *
  * Modifications:
- *
+ *		Robb Matzke, 1999-07-27
+ *		The `%a' format refers to an argument of `haddr_t' type
+ *		instead of `haddr_t*' and the return value is correct.
  *-------------------------------------------------------------------------
  */
 int
@@ -732,8 +731,8 @@ HDfprintf (FILE *stream, const char *fmt, ...)
 
 	    case 'a':
 		if (1) {
-		    haddr_t *x = va_arg (ap, haddr_t*);
-		    if (x && H5F_addr_defined(x)) {
+		    haddr_t x = va_arg (ap, haddr_t);
+		    if (H5F_addr_defined(x)) {
 			sprintf(template, "%%%s%s%s%s%s",
 				leftjust?"-":"", plussign?"+":"",
 				ldspace?" ":"", prefix?"#":"",
@@ -741,15 +740,15 @@ HDfprintf (FILE *stream, const char *fmt, ...)
 			if (fwidth>0) {
 			    sprintf(template+HDstrlen(template), "%d", fwidth);
 			}
-			if (sizeof(x->offset)==SIZEOF_INT) {
+			if (sizeof(x)==SIZEOF_INT) {
 			    HDstrcat(template, "d");
-			} else if (sizeof(x->offset)==SIZEOF_LONG) {
+			} else if (sizeof(x)==SIZEOF_LONG) {
 			    HDstrcat(template, "ld");
-			} else if (sizeof(x->offset)==SIZEOF_LONG_LONG) {
+			} else if (sizeof(x)==SIZEOF_LONG_LONG) {
 			    HDstrcat(template, PRINTF_LL_WIDTH);
 			    HDstrcat(template, "d");
 			}
-			n = fprintf(stream, template, x->offset);
+			n = fprintf(stream, template, x);
 		    } else {
 			HDstrcpy(template, "%");
 			if (leftjust) HDstrcat(template, "-");
@@ -757,7 +756,7 @@ HDfprintf (FILE *stream, const char *fmt, ...)
 			    sprintf(template+HDstrlen(template), "%d", fwidth);
 			}
 			HDstrcat(template, "s");
-			fprintf(stream, template, x?"UNDEF":"NULL");
+			fprintf(stream, template, "UNDEF");
 		    }
 		}
 		break;