[svn-r9955] Purpose:

    New feature & bug fix

Description:
    Allow h5debug tool to dump "test" v2 B-trees correctly.

    Also, fix incorrect parameter passing that was causing failures on
various platforms.

Platforms tested:
    FreeBSD 4.11 (sleipnir)
    AIX 5.2 (copper)

1 files changed, 187 insertions, 0 deletions

diff --git a/src/H5B2test.c b/src/H5B2test.c
new file mode 100644
index 0000000..99690fc
--- /dev/null
+++ b/src/H5B2test.c
@@ -0,0 +1,187 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the files COPYING and Copyright.html.  COPYING can be found at the root   *
+ * of the source code distribution tree; Copyright.html can be found at the  *
+ * root level of an installed copy of the electronic HDF5 document set and   *
+ * is linked from the top-level documents page.  It can also be found at     *
+ * http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have     *
+ * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/* Programmer:  Quincey Koziol <koziol@ncsa.uiuc.edu>
+ *              Saturday, May 31, 2003
+ *
+ * Purpose:	v2 B-tree testing functions.
+ */
+
+#define H5B2_PACKAGE		/*suppress error about including H5B2pkg  */
+#define H5B2_TESTING		/*suppress warning about H5B2 testing funcs*/
+
+/* Private headers */
+#include "H5private.h"		/* Generic Functions			*/
+#include "H5B2pkg.h"		/* B-trees				*/
+
+/* Static Prototypes */
+static herr_t H5B2_test_store(const H5F_t *f, hid_t dxpl_id, const void *udata,
+    void *nrecord);
+static herr_t H5B2_test_compare(const H5F_t *f, hid_t dxpl_id, const void *rec1,
+    const void *rec2);
+static herr_t H5B2_test_encode(const H5F_t *f, uint8_t *raw,
+    const void *nrecord);
+static herr_t H5B2_test_decode(const H5F_t *f, const uint8_t *raw,
+    void *nrecord);
+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 */
+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 */
+    H5B2_test_store,                /* Record storage callback */
+    H5B2_test_compare,              /* Record comparison callback */
+    H5B2_test_encode,               /* Record encoding callback */
+    H5B2_test_decode,               /* Record decoding callback */
+    H5B2_test_debug                 /* Record debugging callback */
+}};
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5B2_test_store
+ *
+ * Purpose:	Store native information into record for B-tree
+ *
+ * Return:	Success:	non-negative
+ *
+ *		Failure:	negative
+ *
+ * Programmer:	Quincey Koziol
+ *              Thursday, February  3, 2005
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5B2_test_store(const H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *udata, void *nrecord)
+{
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_test_store)
+
+    *(hsize_t *)nrecord=*(const hsize_t *)udata;
+
+    FUNC_LEAVE_NOAPI(SUCCEED);
+} /* H5B2_test_store() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5B2_test_compare
+ *
+ * Purpose:	Compare two native information records, according to some key
+ *
+ * Return:	<0 if rec1 < rec2
+ *              =0 if rec1 == rec2
+ *              >0 if rec1 > rec2
+ *
+ * Programmer:	Quincey Koziol
+ *              Thursday, February  3, 2005
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5B2_test_compare(const H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *rec1, const void *rec2)
+{
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_test_compare)
+
+    FUNC_LEAVE_NOAPI(*(const hssize_t *)rec1-*(const hssize_t *)rec2);
+} /* H5B2_test_compare() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5B2_test_encode
+ *
+ * Purpose:	Encode native information into raw form for storing on disk
+ *
+ * Return:	Success:	non-negative
+ *
+ *		Failure:	negative
+ *
+ * Programmer:	Quincey Koziol
+ *              Thursday, February  3, 2005
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5B2_test_encode(const H5F_t *f, uint8_t *raw, const void *nrecord)
+{
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_test_encode)
+
+    H5F_ENCODE_LENGTH(f, raw, *(const hsize_t *)nrecord);
+
+    FUNC_LEAVE_NOAPI(SUCCEED);
+} /* H5B2_test_encode() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5B2_test_decode
+ *
+ * Purpose:	Decode raw disk form of record into native form
+ *
+ * Return:	Success:	non-negative
+ *
+ *		Failure:	negative
+ *
+ * Programmer:	Quincey Koziol
+ *              Friday, February  4, 2005
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5B2_test_decode(const H5F_t *f, const uint8_t *raw, void *nrecord)
+{
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_test_decode)
+
+    H5F_DECODE_LENGTH(f, raw, *(hsize_t *)nrecord);
+
+    FUNC_LEAVE_NOAPI(SUCCEED);
+} /* H5B2_test_decode() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5B2_test_debug
+ *
+ * Purpose:	Debug native form of record
+ *
+ * Return:	Success:	non-negative
+ *
+ *		Failure:	negative
+ *
+ * Programmer:	Quincey Koziol
+ *              Friday, February  4, 2005
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5B2_test_debug(FILE *stream, const H5F_t UNUSED *f, hid_t UNUSED dxpl_id, int indent, int fwidth,
+		      const void *record, const void UNUSED *_udata)
+{
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_test_debug)
+
+    HDassert (record);
+
+    HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth, "Record:",
+        *(const hsize_t *)record);
+
+    FUNC_LEAVE_NOAPI(SUCCEED);
+} /* H5B2_test_debug() */
+