[svn-r11966] Purpose:

    Code cleanup

Description:
    Style fixes for consistency & other minor cleanups

Platforms tested:
    FreeBSD 4.11 (sleipnir)
    Mac OSX (amazon)
    Linux 2.4

1 files changed, 39 insertions, 29 deletions

diff --git a/src/H5B2test.c b/src/H5B2test.c
index 0428b35..26924e7 100644
--- a/src/H5B2test.c
+++ b/src/H5B2test.c
@@ -18,15 +18,33 @@
  * Purpose:	v2 B-tree testing functions.
  */
 
+/****************/
+/* Module Setup */
+/****************/
+
 #define H5B2_PACKAGE		/*suppress error about including H5B2pkg  */
 #define H5B2_TESTING		/*suppress warning about H5B2 testing funcs*/
 
-/* Private headers */
+/***********/
+/* Headers */
+/***********/
 #include "H5private.h"		/* Generic Functions			*/
 #include "H5B2pkg.h"		/* B-trees				*/
 #include "H5Eprivate.h"		/* Error handling		  	*/
 
-/* Static Prototypes */
+/****************/
+/* Local Macros */
+/****************/
+
+
+/******************/
+/* Local Typedefs */
+/******************/
+
+
+/********************/
+/* Local Prototypes */
+/********************/
 static herr_t H5B2_test_store(void *nrecord, const void *udata);
 static herr_t H5B2_test_retrieve(void *udata, const void *nrecord);
 static herr_t H5B2_test_compare(const void *rec1, const void *rec2);
@@ -37,7 +55,9 @@ static herr_t H5B2_test_decode(const H5F_t *f, const uint8_t *raw,
 static herr_t H5B2_test_debug(FILE *stream, const H5F_t *f, hid_t dxpl_id,
     int indent, int fwidth, const void *record, const void *_udata);
 
-/* Package variables */
+/*********************/
+/* Package Variables */
+/*********************/
 const H5B2_class_t H5B2_TEST[1]={{   /* B-tree class information */
     H5B2_TEST_ID,                   /* Type of B-tree */
     sizeof(hsize_t),                /* Size of native key */
@@ -49,6 +69,15 @@ const H5B2_class_t H5B2_TEST[1]={{   /* B-tree class information */
     H5B2_test_debug                 /* Record debugging callback */
 }};
 
+/*****************************/
+/* Library Private Variables */
+/*****************************/
+
+
+/*******************/
+/* Local Variables */
+/*******************/
+
 
 /*-------------------------------------------------------------------------
  * Function:	H5B2_test_store
@@ -62,8 +91,6 @@ const H5B2_class_t H5B2_TEST[1]={{   /* B-tree class information */
  * Programmer:	Quincey Koziol
  *              Thursday, February  3, 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -89,8 +116,6 @@ H5B2_test_store(void *nrecord, const void *udata)
  * Programmer:	Quincey Koziol
  *              Friday, February 25, 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -116,8 +141,6 @@ H5B2_test_retrieve(void *udata, const void *nrecord)
  * Programmer:	Quincey Koziol
  *              Thursday, February  3, 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -141,8 +164,6 @@ H5B2_test_compare(const void *rec1, const void *rec2)
  * Programmer:	Quincey Koziol
  *              Thursday, February  3, 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -168,8 +189,6 @@ H5B2_test_encode(const H5F_t *f, uint8_t *raw, const void *nrecord)
  * Programmer:	Quincey Koziol
  *              Friday, February  4, 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -195,8 +214,6 @@ H5B2_test_decode(const H5F_t *f, const uint8_t *raw, void *nrecord)
  * Programmer:	Quincey Koziol
  *              Friday, February  4, 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -226,23 +243,16 @@ H5B2_test_debug(FILE *stream, const H5F_t UNUSED *f, hid_t UNUSED dxpl_id, int i
  * Programmer:	Quincey Koziol
  *              Saturday, February 26, 2005
  *
- * Modifications:
- *
- *              John Mainzer, 6/17/05
- *              Modified the function to use the new dirtied parameter of
- *              of H5AC_unprotect() instead of modifying the is_dirty
- *              field of the cache info.
- *
  *-------------------------------------------------------------------------
  */
 herr_t
-H5B2_get_root_addr(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type,
+H5B2_get_root_addr_test(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type,
     haddr_t addr, haddr_t *root_addr)
 {
-    H5B2_t	*bt2=NULL;              /* Pointer to the B-tree header */
-    herr_t	ret_value = SUCCEED;
+    H5B2_t	*bt2 = NULL;            /* Pointer to the B-tree header */
+    herr_t	ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5B2_get_root_addr)
+    FUNC_ENTER_NOAPI_NOINIT(H5B2_get_root_addr_test)
 
     /* Check arguments. */
     HDassert(f);
@@ -251,7 +261,7 @@ H5B2_get_root_addr(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type,
     HDassert(root_addr);
 
     /* Look up the B-tree header */
-    if (NULL == (bt2 = H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, addr, type, NULL, H5AC_WRITE)))
+    if(NULL == (bt2 = H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, addr, type, NULL, H5AC_READ)))
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree header")
 
     /* Get B-tree root addr */
@@ -259,9 +269,9 @@ H5B2_get_root_addr(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type,
 
 done:
     /* Release B-tree header node */
-    if (bt2 && H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, addr, bt2, H5AC__NO_FLAGS_SET) < 0)
+    if(bt2 && H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, addr, bt2, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree header info")
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* H5B2_get_root_addr() */
+} /* H5B2_get_root_addr_test() */