[svn-r27] ./src/H5B.c

./src/H5Bprivate.h
	The B-tree K value comes from a combination of the B-tree
	subclass and the file.

./src/H5C.c
./src/H5F.c
./src/hdf5lims.h
./src/hdf5type.h
	Removed the B-tree size parameter and added an array of B-tree
	K values.  Also added symbol table node K value.

./src/H5Eprivate.h
./src/H5Eproto.h
	Added H5E_LINK for errors involving link counts.

./src/H5G.c
	Inserting something into a directory with H5G_insert()
	increments the link count in the object header.  The root
	object should always have a link count of at least 1.

./src/H5Gnode.c
./src/H5Gprivate.h
	The symbol table node K value comes from the file instead of
	being a constant.

./src/H5Olink.c
	Added an assert(), fixed a hard-link bug.

1 files changed, 9 insertions, 4 deletions

diff --git a/src/H5F.c b/src/H5F.c
index 38eb17c..3020dab 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -508,7 +508,8 @@ hatom_t H5Fcreate(const char *filename, uintn flags, hatom_t create_temp, hatom_
     *p++=f_create_parms->offset_size; /* Encode the number of bytes for the offset */
     *p++=f_create_parms->length_size; /* Encode the number of bytes for the length */
     *p++=0;                         /* Encode the reserved byte :-) */
-    UINT32ENCODE(p,f_create_parms->btree_page_size);    /* Encode the B-Tree page size */
+    UINT16ENCODE(p,f_create_parms->sym_leaf_k);	/*symbol table leaf node 1/2 rank */
+    UINT16ENCODE(p,f_create_parms->btree_k[H5B_SNODE_ID]);/*stab internal node 1/2 rank */
     UINT32ENCODE(p,new_file->consist_flags);       /* Encode File-Consistancy flags */
     H5F_encode_offset(new_file,p,new_file->smallobj_off);  /* Encode offset of global small-object heap */
     H5F_encode_offset(new_file,p,new_file->freespace_off);  /* Encode offset of global free-space heap */
@@ -686,7 +687,8 @@ hatom_t H5Fopen(const char *filename, uintn flags, hatom_t access_temp)
     new_file->file_create_parms.offset_size=*p++;   /* Decode the number of bytes for the offset */
     new_file->file_create_parms.length_size=*p++;   /* Decode the number of bytes for the length */
     p++;                         /* Decode the reserved byte :-) */
-    UINT32DECODE(p,new_file->file_create_parms.btree_page_size);    /* Decode the B-Tree page size */
+    UINT16DECODE (p, new_file->file_create_parms.sym_leaf_k); /*stab leaf 1/2 rank*/
+    UINT16DECODE (p, new_file->file_create_parms.btree_k[H5B_SNODE_ID]); /*stab internal 1/2 rank*/
     UINT32DECODE(p,new_file->consist_flags);       /* Decode File-Consistancy flags */
 
     /* Read the variable-size part of the boot-block */
@@ -931,8 +933,11 @@ H5F_debug (hdf5_file_t *f, haddr_t addr, FILE *stream, intn indent,
 	    "Size of file off_t type:",
 	    (unsigned)(f->file_create_parms.length_size));
    fprintf (stream, "%*s%-*s %u\n", indent, "", fwidth,
-	    "Bytes per B-tree page:",
-	    (unsigned)(f->file_create_parms.btree_page_size));
+	    "Symbol table leaf node 1/2 rank:",
+	    (unsigned)(f->file_create_parms.sym_leaf_k));
+   fprintf (stream, "%*s%-*s %u\n", indent, "", fwidth,
+	    "Symbol table internal node 1/2 rank:",
+	    (unsigned)(f->file_create_parms.btree_k[H5B_SNODE_ID]));
    fprintf (stream, "%*s%-*s %u\n", indent, "", fwidth,
 	    "Boot block version number:",
 	    (unsigned)(f->file_create_parms.bootblock_ver));