[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, 121 insertions, 122 deletions

diff --git a/src/H5F.c b/src/H5F.c
index 3becbd0..631afe7 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -110,7 +110,7 @@ static herr_t H5F_dest(H5F_t *f);
 static herr_t H5F_flush(H5F_t *f, H5F_scope_t scope, hbool_t invalidate);
 static herr_t H5F_locate_signature(H5F_low_t *f_handle,
 				   const H5F_access_t *access_parms,
-				   haddr_t *addr/*out*/);
+				   haddr_t *addr_p/*out*/);
 static intn H5F_flush_all_cb(H5F_t *f, const void *_invalidate);
 
 
@@ -216,7 +216,7 @@ H5F_init_interface(void)
     H5F_access_dflt.u.mpio.info = MPI_INFO_NULL;
     H5F_access_dflt.u.mpio.btype = MPI_DATATYPE_NULL;
     H5F_access_dflt.u.mpio.ftype = MPI_DATATYPE_NULL;
-    H5F_addr_reset( &(H5F_access_dflt.u.mpio.disp) );
+    H5F_addr_reset(&(H5F_access_dflt.u.mpio.disp));
     H5F_access_dflt.u.mpio.use_types = 0;
     H5F_access_dflt.u.mpio.old_use_types = 0;
 #elif (H5F_LOW_DFLT == H5F_LOW_SPLIT)
@@ -544,7 +544,7 @@ H5F_compare_files(void * _obj, const void * _key)
  */
 static herr_t
 H5F_locate_signature(H5F_low_t *f_handle, const H5F_access_t *access_parms,
-		     haddr_t *addr/*out*/)
+		     haddr_t *addr_p/*out*/)
 {
     herr_t          ret_value=FAIL;
     haddr_t	    max_addr;
@@ -554,9 +554,9 @@ H5F_locate_signature(H5F_low_t *f_handle, const H5F_access_t *access_parms,
     FUNC_ENTER(H5F_locate_signature, FAIL);
 
     H5F_low_size(f_handle, &max_addr);
-    H5F_addr_reset(addr);
-    while (H5F_addr_lt(addr, &max_addr)) {
-        if (H5F_low_read(f_handle, access_parms, &H5F_xfer_dflt, addr,
+    H5F_addr_reset(addr_p);
+    while (H5F_addr_lt(*addr_p, max_addr)) {
+        if (H5F_low_read(f_handle, access_parms, &H5F_xfer_dflt, *addr_p,
                  H5F_SIGNATURE_LEN, buf) < 0) {
             HRETURN_ERROR(H5E_IO, H5E_READERROR, FAIL, "unable to read file");
         }
@@ -564,7 +564,7 @@ H5F_locate_signature(H5F_low_t *f_handle, const H5F_access_t *access_parms,
             ret_value=SUCCEED;
             break;
         }
-        H5F_addr_pow2(n++, addr);
+        H5F_addr_pow2(n++, addr_p);
     }
 
     FUNC_LEAVE(ret_value);
@@ -619,7 +619,7 @@ H5Fis_hdf5(const char *filename)
 	HGOTO_ERROR(H5E_FILE, H5E_BADFILE, FAIL,
 		    "low-level file open failure");
     }
-    if (H5F_locate_signature(f_handle, &H5F_access_dflt, &addr) >= 0) {
+    if (H5F_locate_signature(f_handle, &H5F_access_dflt, &addr/*out*/)>=0) {
 	ret_value = TRUE;
     }
     
@@ -1106,12 +1106,12 @@ H5F_open(const char *name, uintn flags,
 	/* For existing files we must read the boot block. */
 	if (H5F_locate_signature(f->shared->lf,
 				 f->shared->access_parms,
-				 &(f->shared->boot_addr)) < 0) {
+				 &(f->shared->boot_addr)/*out*/) < 0) {
 	    HGOTO_ERROR(H5E_FILE, H5E_NOTHDF5, NULL,
 			"unable to find signature");
 	}
 	if (H5F_low_read(f->shared->lf, access_parms, &H5F_xfer_dflt,
-			 &(f->shared->boot_addr), fixed_size, buf) < 0) {
+			 f->shared->boot_addr, fixed_size, buf) < 0) {
 	    HGOTO_ERROR(H5E_IO, H5E_READERROR, NULL,
 			"unable to read boot block");
 	}
@@ -1190,22 +1190,22 @@ H5F_open(const char *name, uintn flags,
 			H5G_SIZEOF_ENTRY(f);
 	assert(variable_size <= sizeof buf);
 	addr1 = f->shared->boot_addr;
-	H5F_addr_inc(&addr1, (hsize_t)fixed_size);
+	H5F_addr_inc(&addr1/*in,out*/, (hsize_t)fixed_size);
 	if (H5F_low_read(f->shared->lf, access_parms, &H5F_xfer_dflt,
-			 &addr1, variable_size, buf) < 0) {
+			 addr1, variable_size, buf) < 0) {
 	    HGOTO_ERROR(H5E_FILE, H5E_NOTHDF5, NULL,
 			"unable to read boot block");
 	}
 	p = buf;
-	H5F_addr_decode(f, &p, &(f->shared->base_addr));
-	H5F_addr_decode(f, &p, &(f->shared->freespace_addr));
-	H5F_addr_decode(f, &p, &(f->shared->hdf5_eof));
-	H5F_addr_decode(f, &p, &reserved_addr);
-	if (H5G_ent_decode(f, &p, &root_ent) < 0) {
+	H5F_addr_decode(f, &p, &(f->shared->base_addr)/*out*/);
+	H5F_addr_decode(f, &p, &(f->shared->freespace_addr)/*out*/);
+	H5F_addr_decode(f, &p, &(f->shared->hdf5_eof)/*out*/);
+	H5F_addr_decode(f, &p, &reserved_addr/*out*/);
+	if (H5G_ent_decode(f, &p, &root_ent/*out*/) < 0) {
 	    HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL,
 			"unable to read root symbol entry");
 	}
-	if (H5G_mkroot (f, &root_ent)<0) {
+	if (H5G_mkroot(f, &root_ent)<0) {
 	    HGOTO_ERROR (H5E_FILE, H5E_CANTOPENFILE, NULL,
 			 "unable to read root group");
 	}
@@ -1214,24 +1214,24 @@ H5F_open(const char *name, uintn flags,
 	 * The userdefined data is the area of the file before the base
 	 * address.
 	 */
-	f->shared->create_parms->userblock_size = f->shared->base_addr.offset;
+	f->shared->create_parms->userblock_size = f->shared->base_addr;
     }
     
     /*
      * What is the current size of the file? The max_addr field is a relative
      * address while H5F_low_size() returns an absolute address.
      */
-    H5F_low_size(f->shared->lf, &addr1);
+    H5F_low_size(f->shared->lf, &addr1/*out*/);
     addr2 = f->shared->hdf5_eof;
-    H5F_addr_add(&addr2, &(f->shared->base_addr));
-    if (H5F_addr_lt(&addr1, &addr2)) {
+    H5F_addr_add(&addr2/*in,out*/, f->shared->base_addr);
+    if (H5F_addr_lt(addr1, addr2)) {
 	/*
 	 * Truncated file? This might happen if one tries to open the first
 	 * member of a file family.
 	 */
 	HGOTO_ERROR(H5E_FILE, H5E_TRUNCATED, NULL, "truncated file");
 	
-    } else if (H5F_addr_gt(&addr1, &addr2)) {
+    } else if (H5F_addr_gt(addr1, addr2)) {
 	/*
 	 * The file is larger than the hdf5 data.  It either has extra junk at
 	 * the end, or a wrapper.  In either case, make the file think it's
@@ -1243,10 +1243,10 @@ H5F_open(const char *name, uintn flags,
 #ifdef H5F_DEBUG
 	if (H5DEBUG(F)) {
 	    HDfprintf(H5DEBUG(F), "H5F: resetting EOF from %a to %a (abs)\n",
-		      &addr1, &addr2);
+		      addr1, addr2);
 	}
 #endif
-	H5F_low_seteof(f->shared->lf, &addr2);
+	H5F_low_seteof(f->shared->lf, addr2);
     }
 
     /* Create and/or open the root group if we haven't already done so */
@@ -1648,7 +1648,7 @@ H5F_flush(H5F_t *f, H5F_scope_t scope, hbool_t invalidate)
     }
     
     /* flush (and invalidate) the entire meta data cache */
-    if (H5AC_flush(f, NULL, 0, invalidate) < 0) {
+    if (H5AC_flush(f, NULL, H5F_ADDR_UNDEF, invalidate) < 0) {
 	HRETURN_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL,
 		      "unable to flush meta data cache");
     }
@@ -1670,15 +1670,15 @@ H5F_flush(H5F_t *f, H5F_scope_t scope, hbool_t invalidate)
     UINT16ENCODE(p, f->shared->create_parms->sym_leaf_k);
     UINT16ENCODE(p, f->shared->create_parms->btree_k[H5B_SNODE_ID]);
     UINT32ENCODE(p, f->shared->consist_flags);
-    H5F_addr_encode(f, &p, &(f->shared->base_addr));
-    H5F_addr_encode(f, &p, &(f->shared->freespace_addr));
-    H5F_addr_encode(f, &p, &(f->shared->hdf5_eof));
+    H5F_addr_encode(f, &p, f->shared->base_addr);
+    H5F_addr_encode(f, &p, f->shared->freespace_addr);
+    H5F_addr_encode(f, &p, f->shared->hdf5_eof);
     H5F_addr_undef(&reserved_addr);
-    H5F_addr_encode(f, &p, &reserved_addr);
+    H5F_addr_encode(f, &p, reserved_addr);
     H5G_ent_encode(f, &p, H5G_entof(f->shared->root_grp));
 
     /* update file length if necessary */
-    if (!H5F_addr_defined(&(f->shared->hdf5_eof))) {
+    if (!H5F_addr_defined(f->shared->hdf5_eof)) {
         haddr_t		t_addr;	/*temporary address		*/
 
         /* Set the HDF5 file size */
@@ -1687,8 +1687,8 @@ H5F_flush(H5F_t *f, H5F_scope_t scope, hbool_t invalidate)
 
         /* Set the logical file size, including the userblock data */
         t_addr = f->shared->hdf5_eof;
-        H5F_addr_add(&t_addr, &(f->shared->base_addr));
-        H5F_low_seteof(f->shared->lf, &t_addr);
+        H5F_addr_add(&t_addr/*in,out*/, f->shared->base_addr);
+        H5F_low_seteof(f->shared->lf, t_addr);
 
         /* Indicate that the boot block needs to be flushed out */
         firsttime_bootblock=1;
@@ -1699,9 +1699,11 @@ H5F_flush(H5F_t *f, H5F_scope_t scope, hbool_t invalidate)
 #ifdef HAVE_PARALLEL
         H5F_mpio_tas_allsame(f->shared->lf, TRUE);	/* only p0 will write */
 #endif
-	if (H5F_low_write(f->shared->lf, f->shared->access_parms, &H5F_xfer_dflt,
-			  &(f->shared->boot_addr), (size_t)(p-buf), buf)<0) {
-	    HRETURN_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "unable to write header");
+	if (H5F_low_write(f->shared->lf, f->shared->access_parms,
+			  &H5F_xfer_dflt, f->shared->boot_addr,
+			  (size_t)(p-buf), buf)<0) {
+	    HRETURN_ERROR(H5E_IO, H5E_WRITEERROR, FAIL,
+			  "unable to write header");
 	}
     
         /* Flush file buffers to disk */
@@ -1974,7 +1976,7 @@ H5F_mount(H5G_entry_t *loc, const char *name, H5F_t *child,
     while (lt<rt && cmp) {
 	md = (lt+rt)/2;
 	ent = H5G_entof(parent->mtab.child[md].group);
-	cmp = H5F_addr_cmp(&(mp_ent->header), &(ent->header));
+	cmp = H5F_addr_cmp(mp_ent->header, ent->header);
 	if (cmp<0) {
 	    rt = md;
 	} else if (cmp>0) {
@@ -2071,7 +2073,7 @@ H5F_unmount(H5G_entry_t *loc, const char *name)
     ent = H5G_entof(child->shared->root_grp);
 
     if (child->mtab.parent &&
-	H5F_addr_eq(&(mnt_ent->header), &(ent->header))) {
+	H5F_addr_eq(mnt_ent->header, ent->header)) {
 	/*
 	 * We've been given the root group of the child.  We do a reverse
 	 * lookup in the parent's mount table to find the correct entry.
@@ -2105,7 +2107,7 @@ H5F_unmount(H5G_entry_t *loc, const char *name)
 	while (lt<rt && cmp) {
 	    md = (lt+rt)/2;
 	    ent = H5G_entof(parent->mtab.child[md].group);
-	    cmp = H5F_addr_cmp(&(mnt_ent->header), &(ent->header));
+	    cmp = H5F_addr_cmp(mnt_ent->header, ent->header);
 	    if (cmp<0) {
 		rt = md;
 	    } else {
@@ -2173,7 +2175,7 @@ H5F_mountpoint(H5G_entry_t *find/*in,out*/)
 	while (lt<rt && cmp) {
 	    md = (lt+rt)/2;
 	    ent = H5G_entof(parent->mtab.child[md].group);
-	    cmp = H5F_addr_cmp(&(find->header), &(ent->header));
+	    cmp = H5F_addr_cmp(find->header, ent->header);
 	    if (cmp<0) {
 		rt = md;
 	    } else {
@@ -2362,13 +2364,15 @@ H5Freopen(hid_t file_id)
  *		Jul 10 1997
  *
  * Modifications:
- *		June 2, 1998	Albert Cheng
- *		Added xfer_mode argument
+ *		Albert Cheng, 1998-06-02
+ *		Added XFER_MODE argument
  *
+ * 		Robb Matzke, 1999-07-28
+ *		The ADDR argument is passed by value.
  *-------------------------------------------------------------------------
  */
 herr_t
-H5F_block_read(H5F_t *f, const haddr_t *addr, hsize_t size,
+H5F_block_read(H5F_t *f, haddr_t addr, hsize_t size,
 	       const H5F_xfer_t *xfer_parms, void *buf)
 {
     haddr_t		    abs_addr;
@@ -2379,11 +2383,11 @@ H5F_block_read(H5F_t *f, const haddr_t *addr, hsize_t size,
 
     /* convert the relative address to an absolute address */
     abs_addr = f->shared->base_addr;
-    H5F_addr_add(&abs_addr, addr);
+    H5F_addr_add(&abs_addr/*in,out*/, addr);
 
     /* Read the data */
     if (H5F_low_read(f->shared->lf, f->shared->access_parms, xfer_parms,
-		     &abs_addr, (size_t)size, buf) < 0) {
+		     abs_addr, (size_t)size, buf) < 0) {
 	HRETURN_ERROR(H5E_IO, H5E_READERROR, FAIL, "low-level read failed");
     }
     FUNC_LEAVE(SUCCEED);
@@ -2407,13 +2411,15 @@ H5F_block_read(H5F_t *f, const haddr_t *addr, hsize_t size,
  *		Jul 10 1997
  *
  * Modifications:
- *		June 2, 1998	Albert Cheng
- *		Added xfer_mode argument
+ *		Albert Cheng, 1998-06-02
+ *		Added XFER_MODE argument
  *
+ * 		Robb Matzke, 1999-07-28
+ *		The ADDR argument is passed by value.
  *-------------------------------------------------------------------------
  */
 herr_t
-H5F_block_write(H5F_t *f, const haddr_t *addr, hsize_t size,
+H5F_block_write(H5F_t *f, haddr_t addr, hsize_t size,
 		const H5F_xfer_t *xfer_parms, const void *buf)
 {
     haddr_t		    abs_addr;
@@ -2428,11 +2434,11 @@ H5F_block_write(H5F_t *f, const haddr_t *addr, hsize_t size,
 
     /* Convert the relative address to an absolute address */
     abs_addr = f->shared->base_addr;
-    H5F_addr_add(&abs_addr, addr);
+    H5F_addr_add(&abs_addr/*in,out*/, addr);
 
     /* Write the data */
     if (H5F_low_write(f->shared->lf, f->shared->access_parms, xfer_parms,
-		      &abs_addr, (size_t)size, buf)) {
+		      abs_addr, (size_t)size, buf)) {
 	HRETURN_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "low-level write failed");
     }
 
@@ -2455,92 +2461,85 @@ H5F_block_write(H5F_t *f, const haddr_t *addr, hsize_t size,
  *		Aug  1 1997
  *
  * Modifications:
- *
+ *		Robb Matzke, 1999-07-28
+ *		The ADDR argument is passed by value.
  *-------------------------------------------------------------------------
  */
 herr_t
-H5F_debug(H5F_t *f, const haddr_t UNUSED *addr, FILE * stream,
-	  intn indent, intn fwidth)
+H5F_debug(H5F_t *f, haddr_t UNUSED addr, FILE * stream, intn indent,
+	  intn fwidth)
 {
     FUNC_ENTER(H5F_debug, FAIL);
 
     /* check args */
     assert(f);
-    assert(addr && H5F_addr_defined(addr));
+    assert(H5F_addr_defined(addr));
     assert(stream);
     assert(indent >= 0);
     assert(fwidth >= 0);
 
     /* debug */
-    fprintf(stream, "%*sFile Boot Block...\n", indent, "");
-
-    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-	    "File name:",
-	    f->name);
-    fprintf(stream, "%*s%-*s 0x%08x\n", indent, "", fwidth,
-	    "Flags",
-	    (unsigned) (f->shared->flags));
-    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	    "Reference count:",
-	    (unsigned) (f->shared->nrefs));
-    fprintf(stream, "%*s%-*s 0x%08lx\n", indent, "", fwidth,
-	    "Consistency flags:",
-	    (unsigned long) (f->shared->consist_flags));
-
-    fprintf(stream, "%*s%-*s ", indent, "", fwidth,
-	    "Address of boot block:");
-    H5F_addr_print(stream, &(f->shared->boot_addr));
-    fprintf(stream, " (abs)\n");
-
-    fprintf(stream, "%*s%-*s ", indent, "", fwidth,
-	    "Base address:");
-    H5F_addr_print(stream, &(f->shared->base_addr));
-    fprintf(stream, " (abs)\n");
-
-    fprintf(stream, "%*s%-*s ", indent, "", fwidth,
-	    "Free list address:");
-    H5F_addr_print(stream, &(f->shared->freespace_addr));
-    fprintf(stream, " (rel)\n");
-
-    fprintf(stream, "%*s%-*s ", indent, "", fwidth,
-	    "Total size of hdf5 data:");
-    H5F_addr_print(stream, &(f->shared->hdf5_eof));
-    fprintf(stream, " bytes\n");
-
-    fprintf(stream, "%*s%-*s %lu bytes\n", indent, "", fwidth,
-	    "Size of user block:",
-	    (unsigned long) (f->shared->create_parms->userblock_size));
-    fprintf(stream, "%*s%-*s %u bytes\n", indent, "", fwidth,
-	    "Size of file size_t type:",
-	    (unsigned) (f->shared->create_parms->sizeof_size));
-    fprintf(stream, "%*s%-*s %u bytes\n", indent, "", fwidth,
-	    "Size of file haddr_t type:",
-	    (unsigned) (f->shared->create_parms->sizeof_addr));
-    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	    "Symbol table leaf node 1/2 rank:",
-	    (unsigned) (f->shared->create_parms->sym_leaf_k));
-    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	    "Symbol table internal node 1/2 rank:",
-	    (unsigned) (f->shared->create_parms->btree_k[H5B_SNODE_ID]));
-    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	    "Boot block version number:",
-	    (unsigned) (f->shared->create_parms->bootblock_ver));
-    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	    "Free list version number:",
-	    (unsigned) (f->shared->create_parms->freespace_ver));
-    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	    "Object directory version number:",
-	    (unsigned) (f->shared->create_parms->objectdir_ver));
-    fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	    "Shared header version number:",
-	    (unsigned) (f->shared->create_parms->sharedheader_ver));
-
-    fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-	    "Root group symbol table entry:",
-	    f->shared->root_grp ? "" : "(none)");
+    HDfprintf(stream, "%*sFile Boot Block...\n", indent, "");
+
+    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+	      "File name:",
+	      f->name);
+    HDfprintf(stream, "%*s%-*s 0x%08x\n", indent, "", fwidth,
+	      "Flags",
+	      (unsigned) (f->shared->flags));
+    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+	      "Reference count:",
+	      (unsigned) (f->shared->nrefs));
+    HDfprintf(stream, "%*s%-*s 0x%08lx\n", indent, "", fwidth,
+	      "Consistency flags:",
+	      (unsigned long) (f->shared->consist_flags));
+
+    HDfprintf(stream, "%*s%-*s %a (abs)\n", indent, "", fwidth,
+	      "Address of boot block:", f->shared->boot_addr);
+
+    HDfprintf(stream, "%*s%-*s %a (abs)\n", indent, "", fwidth,
+	      "Base address:", f->shared->base_addr);
+
+    HDfprintf(stream, "%*s%-*s %a (rel)\n", indent, "", fwidth,
+	      "Free list address:", f->shared->freespace_addr);
+
+    HDfprintf(stream, "%*s%-*s %a bytes\n", indent, "", fwidth,
+	      "Total size of hdf5 data:", f->shared->hdf5_eof);
+
+    HDfprintf(stream, "%*s%-*s %lu bytes\n", indent, "", fwidth,
+	      "Size of user block:",
+	      (unsigned long) (f->shared->create_parms->userblock_size));
+    HDfprintf(stream, "%*s%-*s %u bytes\n", indent, "", fwidth,
+	      "Size of file size_t type:",
+	      (unsigned) (f->shared->create_parms->sizeof_size));
+    HDfprintf(stream, "%*s%-*s %u bytes\n", indent, "", fwidth,
+	      "Size of file haddr_t type:",
+	      (unsigned) (f->shared->create_parms->sizeof_addr));
+    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+	      "Symbol table leaf node 1/2 rank:",
+	      (unsigned) (f->shared->create_parms->sym_leaf_k));
+    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+	      "Symbol table internal node 1/2 rank:",
+	      (unsigned) (f->shared->create_parms->btree_k[H5B_SNODE_ID]));
+    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+	      "Boot block version number:",
+	      (unsigned) (f->shared->create_parms->bootblock_ver));
+    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+	      "Free list version number:",
+	      (unsigned) (f->shared->create_parms->freespace_ver));
+    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+	      "Object directory version number:",
+	      (unsigned) (f->shared->create_parms->objectdir_ver));
+    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
+	      "Shared header version number:",
+	      (unsigned) (f->shared->create_parms->sharedheader_ver));
+
+    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+	      "Root group symbol table entry:",
+	      f->shared->root_grp ? "" : "(none)");
     if (f->shared->root_grp) {
-	H5G_ent_debug(f, H5G_entof (f->shared->root_grp), stream,
-		      indent+3, MAX(0, fwidth-3), NULL);
+	H5G_ent_debug(f, H5G_entof(f->shared->root_grp), stream,
+		      indent+3, MAX(0, fwidth-3), H5F_ADDR_UNDEF);
     }
     FUNC_LEAVE(SUCCEED);
 }