[svn-r55] ./src/H5F.c

	Added H5Fflush() and H5F_flush() which flush (and optionally
	invalidate the cache) and flush the file boot block.

	H5Fcreate() calls H5F_flush() to output the boot block.

	H5Fclose() calls H5F_flush() to update the boot block.

	H5F_debug() prints the root symbol table entry.

./src/H5Fpublic.h
	Added H5Fflush() prototype.

./src/H5G.c
	The name message is removed when an object moves from the root
	object position into a directory.

	Added H5G_debug() to print a symbol table entry.  Most of the
	code was just moved from H5G_node_debug().

./src/H5Gnode.c
	Moved some debugging code into H5G_debug().

./src/H5Gprivate.c
	Added H5G_debug() prototype.

./src/H5O.c
	Implemented H5O_remove().

	Added identifiers for H5O_SIM_DIM and H5O_SIM_DTYPE so they
	can be read from files.

	H5O_load() combines adjacent null messages for better memory
	management.

./src/H5Oprivate.h
	Changed minimum header data block size from 16 to 32 bytes.

	Changed prototype for H5O_remove()

1 files changed, 2 insertions, 52 deletions

diff --git a/src/H5Gnode.c b/src/H5Gnode.c
index dd3e832..6c0866b 100644
--- a/src/H5Gnode.c
+++ b/src/H5Gnode.c
@@ -863,8 +863,7 @@ herr_t
 H5G_node_debug (hdf5_file_t *f, haddr_t addr, FILE *stream, intn indent,
 		intn fwidth, haddr_t heap)
 {
-   int		i, j;
-   char		buf[64];
+   int		i;
    H5G_node_t	*sn = NULL;
    herr_t	status;
    const char	*s;
@@ -909,56 +908,7 @@ H5G_node_debug (hdf5_file_t *f, haddr_t addr, FILE *stream, intn indent,
 		  "Name:",
 		  s);
       }
-      fprintf (stream, "%*s%-*s %lu\n", indent, "", fwidth,
-	       "Name offset into private heap:",
-	       (unsigned long)(sn->entry[i].name_off));
-      fprintf (stream, "%*s%-*s %lu\n", indent, "", fwidth,
-	       "Object header address:",
-	       (unsigned long)(sn->entry[i].header));
-      
-      fprintf (stream, "%*s%-*s ", indent, "", fwidth,
-	       "Symbol type:");
-      switch (sn->entry[i].type) {
-      case H5G_NOTHING_CACHED:
-	 fprintf (stream, "Nothing Cached\n");
-	 break;
-	 
-      case H5G_CACHED_SDATA:
-	 fprintf (stream, "S-data\n");
-	 fprintf (stream, "%*s%-*s %u\n", indent, "", fwidth,
-		  "Number type length:",
-		  (unsigned)(sn->entry[i].cache.sdata.nt.length));
-	 fprintf (stream, "%*s%-*s %u\n", indent, "", fwidth,
-		  "Number type architecture:",
-		  (unsigned)(sn->entry[i].cache.sdata.nt.arch));
-	 fprintf (stream, "%*s%-*s %u\n", indent, "", fwidth,
-		  "Number type type:",
-		  (unsigned)(sn->entry[i].cache.sdata.nt.type));
-	 fprintf (stream, "%*s%-*s %u\n", indent, "", fwidth,
-		  "Dimensionality:",
-		  (unsigned)(sn->entry[i].cache.sdata.ndim));
-	 for (j=0; j<sn->entry[i].cache.sdata.ndim && j<4; j++) {
-	    sprintf (buf, "Dimension %d", j);
-	    fprintf (stream, "%*s%-*s %u\n", indent, "", fwidth,
-		     buf,
-		     (unsigned)(sn->entry[i].cache.sdata.dim[j]));
-	 }
-	 break;
-	 
-      case H5G_CACHED_STAB:
-	 fprintf (stream, "Symbol Table\n");
-	 fprintf (stream, "%*s%-*s %lu\n", indent, "", fwidth,
-		  "B-tree address:",
-		  (unsigned long)(sn->entry[i].cache.stab.btree));
-	 fprintf (stream, "%*s%-*s %lu\n", indent, "", fwidth,
-		  "Heap address:",
-		  (unsigned long)(sn->entry[i].cache.stab.heap));
-	 break;
-
-      default:
-	 fprintf (stream, "*** Unknown symbol type %d\n", sn->entry[i].type);
-	 break;
-      }
+      H5G_debug (f, sn->entry+i, stream, indent, fwidth);
    }
 
    FUNC_LEAVE (SUCCEED);