[svn-r9727] Purpose:

    Bug Fix/Code Cleanup/Doc Cleanup/Optimization/Branch Sync :-)

Description:
    Generally speaking, this is the "signed->unsigned" change to selections.
However, in the process of merging code back, things got stickier and stickier
until I ended up doing a big "sync the two branches up" operation.  So... I
brought back all the "infrastructure" fixes from the development branch to the
release branch (which I think were actually making some improvement in
performance) as well as fixed several bugs which had been fixed in one branch,
but not the other.

    I've also tagged the repository before making this checkin with the label
"before_signed_unsigned_changes".

Platforms tested:
    FreeBSD 4.10 (sleipnir) w/parallel & fphdf5
    FreeBSD 4.10 (sleipnir) w/threadsafe
    FreeBSD 4.10 (sleipnir) w/backward compatibility
    Solaris 2.7 (arabica) w/"purify options"
    Solaris 2.8 (sol) w/FORTRAN & C++
    AIX 5.x (copper) w/parallel & FORTRAN
    IRIX64 6.5 (modi4) w/FORTRAN
    Linux 2.4 (heping) w/FORTRAN & C++


Misc. update:

1 files changed, 0 insertions, 283 deletions

diff --git a/src/H5Pfcpl.c b/src/H5Pfcpl.c
index 25e7b3f..2d20d3f 100644
--- a/src/H5Pfcpl.c
+++ b/src/H5Pfcpl.c
@@ -29,78 +29,6 @@
 
 /* Static function prototypes */
 
-#ifdef H5_WANT_H5_V1_6_COMPAT
-
-/*-------------------------------------------------------------------------
- * Function:	H5Pget_version
- *
- * Purpose:	Retrieves version information for various parts of a file.
- *
- *		SUPER:		The file super block.
- *		HEAP:		The global heap.
- *		FREELIST:	The global free list.
- *		STAB:		The root symbol table entry.
- *		SHHDR:		Shared object headers.
- *
- *		Any (or even all) of the output arguments can be null
- *		pointers.
- *
- * Return:	Success:	Non-negative, version information is returned
- *				through the arguments.
- *
- *		Failure:	Negative
- *
- * Programmer:	Robb Matzke
- *		Wednesday, January  7, 1998
- *
- * Modifications:
- *
- * 		Raymond Lu, Oct 14, 2001
- * 		Change to the new generic property list.
- *	
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Pget_version(hid_t plist_id, int *_super/*out*/, int *_freelist/*out*/,
-	       int *_stab/*out*/, int *_shhdr/*out*/)
-{
-    unsigned super,freelist,stab,shhdr; /* Unsigned versions to query into */
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value=SUCCEED;   /* Return value */
-
-    FUNC_ENTER_API(H5Pget_version, FAIL);
-    H5TRACE5("e","ixxxx",plist_id,_super,_freelist,_stab,_shhdr);
-
-    /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_CREATE)))
-        HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID");
-
-    /* Get values */
-    if (_super) {
-        if(H5P_get(plist, H5F_CRT_SUPER_VERS_NAME, &super) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get superblock version");
-        *_super=(int)super;
-    } /* end if */
-    if (_freelist) {
-        if(H5P_get(plist, H5F_CRT_FREESPACE_VERS_NAME, &freelist) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get free-space version");
-        *_freelist=(int)freelist;
-    } /* end if */
-    if (_stab) {
-        if(H5P_get(plist, H5F_CRT_OBJ_DIR_VERS_NAME, &stab) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get object directory version");
-        *_stab=(int)stab;
-    } /* end if */
-    if (_shhdr) {
-        if(H5P_get(plist, H5F_CRT_SHARE_HEAD_VERS_NAME, &shhdr) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get shared-header version");
-        *_shhdr=(int)shhdr;
-    } /* end if */
-
-done:
-    FUNC_LEAVE_API(ret_value);
-}
-#else /* H5_WANT_H5_V1_6_COMPAT */
 
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_version
@@ -162,7 +90,6 @@ H5Pget_version(hid_t plist_id, unsigned *super/*out*/, unsigned *freelist/*out*/
 done:
     FUNC_LEAVE_API(ret_value);
 }
-#endif /* H5_WANT_H5_V1_6_COMPAT */
 
 
 /*-------------------------------------------------------------------------
@@ -357,117 +284,6 @@ done:
     FUNC_LEAVE_API(ret_value);
 }
 
-#ifdef H5_WANT_H5_V1_6_COMPAT
-
-/*-------------------------------------------------------------------------
- * Function:	H5Pset_sym_k
- *
- * Purpose:	IK is one half the rank of a tree that stores a symbol
- *		table for a group.  Internal nodes of the symbol table are on
- *		average 75% full.  That is, the average rank of the tree is
- *		1.5 times the value of IK.
- *
- *		LK is one half of the number of symbols that can be stored in
- *		a symbol table node.  A symbol table node is the leaf of a
- *		symbol table tree which is used to store a group.  When
- *		symbols are inserted randomly into a group, the group's
- *		symbol table nodes are 75% full on average.  That is, they
- *		contain 1.5 times the number of symbols specified by LK.
- *
- *		Either (or even both) of IK and LK can be zero in which case
- *		that value is left unchanged.
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Robb Matzke
- *		Tuesday, January  6, 1998
- *
- * Modifications:
- *
- *		Raymond Lu, Oct 14, 2001
- *         	Changed to the new generic property list. 
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Pset_sym_k(hid_t plist_id, int ik, unsigned lk)
-{
-    unsigned btree_k[H5B_NUM_BTREE_ID];
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t      ret_value=SUCCEED;       /* Return value */
-
-    FUNC_ENTER_API(H5Pset_sym_k, FAIL);
-    H5TRACE3("e","iIsIu",plist_id,ik,lk);
-
-    /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_CREATE)))
-        HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID");
-   
-    /* Set values */
-    if (ik > 0) {
-        if(H5P_get(plist, H5F_CRT_BTREE_RANK_NAME, btree_k) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get rank for btree interanl nodes");
-        btree_k[H5B_SNODE_ID] = (unsigned)ik;
-        if(H5P_set(plist, H5F_CRT_BTREE_RANK_NAME, btree_k) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set rank for btree nodes");
-    }
-    if (lk > 0)
-        if(H5P_set(plist, H5F_CRT_SYM_LEAF_NAME, &lk) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set rank for symbol table leaf nodes");
-
-done:
-    FUNC_LEAVE_API(ret_value);
-}
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5Pget_sym_k
- *
- * Purpose:	Retrieves the symbol table B-tree 1/2 rank (IK) and the
- *		symbol table leaf node 1/2 size (LK).  See H5Pset_sym_k() for
- *		details. Either (or even both) IK and LK may be null
- *		pointers.
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Robb Matzke
- *		Wednesday, January  7, 1998
- *
- * Modifications:
- *
- *		Raymond Lu
- *		Changed to the new generic property list.
- *	
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Pget_sym_k(hid_t plist_id, int *ik /*out */ , unsigned *lk /*out */ )
-{
-    unsigned btree_k[H5B_NUM_BTREE_ID];
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t      ret_value=SUCCEED;       /* Return value */
-
-    FUNC_ENTER_API(H5Pget_sym_k, FAIL);
-    H5TRACE3("e","ixx",plist_id,ik,lk);
-
-    /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_CREATE)))
-        HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID");
-
-    /* Get values */
-    if (ik) {
-        if(H5P_get(plist, H5F_CRT_BTREE_RANK_NAME, btree_k) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get rank for btree nodes");
-        *ik = (int)btree_k[H5B_SNODE_ID];
-    }
-    if (lk)
-        if(H5P_get(plist, H5F_CRT_SYM_LEAF_NAME, lk) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get rank for symbol table leaf nodes");
-
-done:
-    FUNC_LEAVE_API(ret_value);
-}
-#else /* H5_WANT_H5_V1_6_COMPAT */
 
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_sym_k
@@ -577,105 +393,7 @@ H5Pget_sym_k(hid_t plist_id, unsigned *ik /*out */ , unsigned *lk /*out */ )
 done:
     FUNC_LEAVE_API(ret_value);
 }
-#endif /* H5_WANT_H5_V1_6_COMPAT */
-
-#ifdef H5_WANT_H5_V1_6_COMPAT
-
-/*-------------------------------------------------------------------------
- * Function:	H5Pset_istore_k
- *
- * Purpose:	IK is one half the rank of a tree that stores chunked raw
- *		data.  On average, such a tree will be 75% full, or have an
- *		average rank of 1.5 times the value of IK.
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Robb Matzke
- *		Tuesday, January  6, 1998
- *
- * Modifications:
- *
- *		Raymond Lu, Oct 14, 2001
- *		Changed to the new generic property list.
- *	
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Pset_istore_k(hid_t plist_id, int ik)
-{
-    unsigned btree_k[H5B_NUM_BTREE_ID];
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t      ret_value=SUCCEED;       /* Return value */
 
-    FUNC_ENTER_API(H5Pset_istore_k, FAIL);
-    H5TRACE2("e","iIs",plist_id,ik);
-
-    /* Check arguments */
-    if (ik <= 0)
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "istore IK value must be positive");
-
-    /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_CREATE)))
-        HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID");
-
-    /* Set value */
-    if(H5P_get(plist, H5F_CRT_BTREE_RANK_NAME, btree_k) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get rank for btree interanl nodes");
-    btree_k[H5B_ISTORE_ID] = (unsigned)ik;
-    if(H5P_set(plist, H5F_CRT_BTREE_RANK_NAME, btree_k) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set rank for btree interanl nodes");
-
-done:
-    FUNC_LEAVE_API(ret_value);
-}
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5Pget_istore_k
- *
- * Purpose:	Queries the 1/2 rank of an indexed storage B-tree.  See
- *		H5Pset_istore_k() for details.	The argument IK may be the
- *		null pointer.
- *
- * Return:	Success:	Non-negative, size returned through IK
- *
- *		Failure:	Negative
- *
- * Programmer:	Robb Matzke
- *		Wednesday, January  7, 1998
- *
- * Modifications:
- *
- *		Raymond Lu, Oct 14, 2001
- *		Changed to the new generic property list.
- *	
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Pget_istore_k(hid_t plist_id, int *ik /*out */ )
-{
-    unsigned btree_k[H5B_NUM_BTREE_ID];
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value=SUCCEED;   /* return value */
-
-    FUNC_ENTER_API(H5Pget_istore_k, FAIL);
-    H5TRACE2("e","ix",plist_id,ik);
-
-    /* Get the plist structure */
-    if(NULL == (plist = H5P_object_verify(plist_id,H5P_FILE_CREATE)))
-        HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID");
-
-    /* Get value */
-    if (ik) {
-        if(H5P_get(plist, H5F_CRT_BTREE_RANK_NAME, btree_k) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get rank for btree interanl nodes");
-        *ik = (int)btree_k[H5B_ISTORE_ID];
-    }
-
-done:
-    FUNC_LEAVE_API(ret_value);
-}
-#else /* H5_WANT_H5_V1_6_COMPAT */
 
 /*-------------------------------------------------------------------------
  * Function:	H5Pset_istore_k
@@ -771,5 +489,4 @@ H5Pget_istore_k(hid_t plist_id, unsigned *ik /*out */ )
 done:
     FUNC_LEAVE_API(ret_value);
 }
-#endif /* H5_WANT_H5_V1_6_COMPAT */