Source formatted

1 files changed, 89 insertions, 112 deletions

diff --git a/src/H5Abtree2.c b/src/H5Abtree2.c
index 318c60d..34359d6 100644
--- a/src/H5Abtree2.c
+++ b/src/H5Abtree2.c
@@ -26,23 +26,20 @@
 /* Module Setup */
 /****************/
 
-#define H5A_PACKAGE		/*suppress error about including H5Apkg  */
-
+#define H5A_PACKAGE /*suppress error about including H5Apkg  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Apkg.h"		/* Attributes	  			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5SMprivate.h"	/* Shared object header messages        */
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Apkg.h"      /* Attributes	  			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5SMprivate.h" /* Shared object header messages        */
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
@@ -53,23 +50,21 @@
  */
 typedef struct H5A_fh_ud_cmp_t {
     /* downward */
-    H5F_t       *f;                     /* Pointer to file that fractal heap is in */
-    hid_t       dxpl_id;                /* DXPL for operation                */
-    const char  *name;                  /* Name of attribute to compare      */
-    const H5A_dense_bt2_name_rec_t *record;     /* v2 B-tree record for attribute */
-    H5A_bt2_found_t found_op;           /* Callback when correct attribute is found */
-    void        *found_op_data;         /* Callback data when correct attribute is found */
+    H5F_t *                         f;             /* Pointer to file that fractal heap is in */
+    hid_t                           dxpl_id;       /* DXPL for operation                */
+    const char *                    name;          /* Name of attribute to compare      */
+    const H5A_dense_bt2_name_rec_t *record;        /* v2 B-tree record for attribute */
+    H5A_bt2_found_t                 found_op;      /* Callback when correct attribute is found */
+    void *                          found_op_data; /* Callback data when correct attribute is found */
 
     /* upward */
-    int         cmp;                    /* Comparison of two attribute names */
+    int cmp; /* Comparison of two attribute names */
 } H5A_fh_ud_cmp_t;
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
@@ -79,74 +74,67 @@ typedef struct H5A_fh_ud_cmp_t {
 /* v2 B-tree driver callbacks for 'creation order' index */
 static herr_t H5A_dense_btree2_corder_store(void *native, const void *udata);
 static herr_t H5A_dense_btree2_corder_compare(const void *rec1, const void *rec2, int *result);
-static herr_t H5A_dense_btree2_corder_encode(uint8_t *raw, const void *native,
-    void *ctx);
-static herr_t H5A_dense_btree2_corder_decode(const uint8_t *raw, void *native,
-    void *ctx);
-static herr_t H5A_dense_btree2_corder_debug(FILE *stream, const H5F_t *f, hid_t dxpl_id,
-    int indent, int fwidth, const void *record, const void *_udata);
+static herr_t H5A_dense_btree2_corder_encode(uint8_t *raw, const void *native, void *ctx);
+static herr_t H5A_dense_btree2_corder_decode(const uint8_t *raw, void *native, void *ctx);
+static herr_t H5A_dense_btree2_corder_debug(FILE *stream, const H5F_t *f, hid_t dxpl_id, int indent,
+                                            int fwidth, const void *record, const void *_udata);
 
 /* v2 B-tree driver callbacks for 'name' index */
 static herr_t H5A_dense_btree2_name_store(void *native, const void *udata);
 static herr_t H5A_dense_btree2_name_compare(const void *rec1, const void *rec2, int *result);
-static herr_t H5A_dense_btree2_name_encode(uint8_t *raw, const void *native,
-    void *ctx);
-static herr_t H5A_dense_btree2_name_decode(const uint8_t *raw, void *native,
-    void *ctx);
-static herr_t H5A_dense_btree2_name_debug(FILE *stream, const H5F_t *f, hid_t dxpl_id,
-    int indent, int fwidth, const void *record, const void *_udata);
+static herr_t H5A_dense_btree2_name_encode(uint8_t *raw, const void *native, void *ctx);
+static herr_t H5A_dense_btree2_name_decode(const uint8_t *raw, void *native, void *ctx);
+static herr_t H5A_dense_btree2_name_debug(FILE *stream, const H5F_t *f, hid_t dxpl_id, int indent, int fwidth,
+                                          const void *record, const void *_udata);
 
 /* Fractal heap function callbacks */
 static herr_t H5A_dense_fh_name_cmp(const void *obj, size_t obj_len, void *op_data);
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 /* v2 B-tree class for indexing 'name' field of attributes */
-const H5B2_class_t H5A_BT2_NAME[1]={{  /* B-tree class information */
-    H5B2_ATTR_DENSE_NAME_ID,           /* Type of B-tree */
-    "H5B2_ATTR_DENSE_NAME_ID",         /* Name of B-tree class */
-    sizeof(H5A_dense_bt2_name_rec_t),  /* Size of native record */
-    NULL,                              /* Create client callback context */
-    NULL,                              /* Destroy client callback context */
-    H5A_dense_btree2_name_store,       /* Record storage callback */
-    H5A_dense_btree2_name_compare,     /* Record comparison callback */
-    H5A_dense_btree2_name_encode,      /* Record encoding callback */
-    H5A_dense_btree2_name_decode,      /* Record decoding callback */
-    H5A_dense_btree2_name_debug,       /* Record debugging callback */
-    NULL,                              /* Create debugging context */
-    NULL                               /* Destroy debugging context */
+const H5B2_class_t H5A_BT2_NAME[1] = {{
+    /* B-tree class information */
+    H5B2_ATTR_DENSE_NAME_ID,          /* Type of B-tree */
+    "H5B2_ATTR_DENSE_NAME_ID",        /* Name of B-tree class */
+    sizeof(H5A_dense_bt2_name_rec_t), /* Size of native record */
+    NULL,                             /* Create client callback context */
+    NULL,                             /* Destroy client callback context */
+    H5A_dense_btree2_name_store,      /* Record storage callback */
+    H5A_dense_btree2_name_compare,    /* Record comparison callback */
+    H5A_dense_btree2_name_encode,     /* Record encoding callback */
+    H5A_dense_btree2_name_decode,     /* Record decoding callback */
+    H5A_dense_btree2_name_debug,      /* Record debugging callback */
+    NULL,                             /* Create debugging context */
+    NULL                              /* Destroy debugging context */
 }};
 
 /* v2 B-tree class for indexing 'creation order' field of attributes */
-const H5B2_class_t H5A_BT2_CORDER[1]={{ /* B-tree class information */
-    H5B2_ATTR_DENSE_CORDER_ID,         /* Type of B-tree */
-    "H5B2_ATTR_DENSE_CORDER_ID",       /* Name of B-tree class */
-    sizeof(H5A_dense_bt2_corder_rec_t),/* Size of native record */
-    NULL,                              /* Create client callback context */
-    NULL,                              /* Destroy client callback context */
-    H5A_dense_btree2_corder_store,     /* Record storage callback */
-    H5A_dense_btree2_corder_compare,   /* Record comparison callback */
-    H5A_dense_btree2_corder_encode,    /* Record encoding callback */
-    H5A_dense_btree2_corder_decode,    /* Record decoding callback */
-    H5A_dense_btree2_corder_debug,     /* Record debugging callback */
-    NULL,                              /* Create debugging context */
-    NULL                               /* Destroy debugging context */
+const H5B2_class_t H5A_BT2_CORDER[1] = {{
+    /* B-tree class information */
+    H5B2_ATTR_DENSE_CORDER_ID,          /* Type of B-tree */
+    "H5B2_ATTR_DENSE_CORDER_ID",        /* Name of B-tree class */
+    sizeof(H5A_dense_bt2_corder_rec_t), /* Size of native record */
+    NULL,                               /* Create client callback context */
+    NULL,                               /* Destroy client callback context */
+    H5A_dense_btree2_corder_store,      /* Record storage callback */
+    H5A_dense_btree2_corder_compare,    /* Record comparison callback */
+    H5A_dense_btree2_corder_encode,     /* Record encoding callback */
+    H5A_dense_btree2_corder_decode,     /* Record decoding callback */
+    H5A_dense_btree2_corder_debug,      /* Record debugging callback */
+    NULL,                               /* Create debugging context */
+    NULL                                /* Destroy debugging context */
 }};
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_dense_fh_name_cmp
  *
@@ -164,43 +152,43 @@ const H5B2_class_t H5A_BT2_CORDER[1]={{ /* B-tree class information */
 static herr_t
 H5A_dense_fh_name_cmp(const void *obj, size_t obj_len, void *_udata)
 {
-    H5A_fh_ud_cmp_t *udata = (H5A_fh_ud_cmp_t *)_udata;         /* User data for 'op' callback */
-    H5A_t *attr = NULL;                 /* Pointer to attribute created from heap object */
-    hbool_t took_ownership = FALSE;     /* Whether the "found" operator took ownership of the attribute */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5A_fh_ud_cmp_t *udata = (H5A_fh_ud_cmp_t *)_udata; /* User data for 'op' callback */
+    H5A_t *          attr  = NULL;                      /* Pointer to attribute created from heap object */
+    hbool_t took_ownership = FALSE;   /* Whether the "found" operator took ownership of the attribute */
+    herr_t  ret_value      = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Decode attribute information */
-    if(NULL == (attr = (H5A_t *)H5O_msg_decode(udata->f, udata->dxpl_id, NULL, H5O_ATTR_ID, obj_len, (const unsigned char *)obj)))
+    if (NULL == (attr = (H5A_t *)H5O_msg_decode(udata->f, udata->dxpl_id, NULL, H5O_ATTR_ID, obj_len,
+                                                (const unsigned char *)obj)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTDECODE, FAIL, "can't decode attribute")
 
     /* Compare the string values */
     udata->cmp = HDstrcmp(udata->name, attr->shared->name);
 
     /* Check for correct attribute & callback to make */
-    if(udata->cmp == 0 && udata->found_op) {
+    if (udata->cmp == 0 && udata->found_op) {
         /* Check whether we should "reconstitute" the shared message info */
-        if(udata->record->flags & H5O_MSG_FLAG_SHARED)
+        if (udata->record->flags & H5O_MSG_FLAG_SHARED)
             H5SM_reconstitute(&(attr->sh_loc), udata->f, H5O_ATTR_ID, udata->record->id);
 
         /* Set the creation order index for the attribute */
         attr->shared->crt_idx = udata->record->corder;
 
         /* Make callback */
-        if((udata->found_op)(attr, &took_ownership, udata->found_op_data) < 0)
+        if ((udata->found_op)(attr, &took_ownership, udata->found_op_data) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTOPERATE, FAIL, "attribute found callback failed")
     } /* end if */
 
 done:
     /* Release the space allocated for the attrbute */
-    if(attr && !took_ownership)
+    if (attr && !took_ownership)
         H5O_msg_free(H5O_ATTR_ID, attr);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A_dense_fh_name_cmp() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_dense_btree2_name_store
  *
@@ -217,21 +205,20 @@ done:
 static herr_t
 H5A_dense_btree2_name_store(void *_nrecord, const void *_udata)
 {
-    const H5A_bt2_ud_ins_t *udata = (const H5A_bt2_ud_ins_t *)_udata;
+    const H5A_bt2_ud_ins_t *  udata   = (const H5A_bt2_ud_ins_t *)_udata;
     H5A_dense_bt2_name_rec_t *nrecord = (H5A_dense_bt2_name_rec_t *)_nrecord;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Copy user information info native record */
-    nrecord->id = udata->id;
-    nrecord->flags = udata->common.flags;
+    nrecord->id     = udata->id;
+    nrecord->flags  = udata->common.flags;
     nrecord->corder = udata->common.corder;
-    nrecord->hash = udata->common.name_hash;
+    nrecord->hash   = udata->common.name_hash;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5A_dense_btree2_name_store() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_dense_btree2_name_compare
  *
@@ -249,9 +236,9 @@ H5A_dense_btree2_name_store(void *_nrecord, const void *_udata)
 static herr_t
 H5A_dense_btree2_name_compare(const void *_bt2_udata, const void *_bt2_rec, int *result)
 {
-    const H5A_bt2_ud_common_t *bt2_udata = (const H5A_bt2_ud_common_t *)_bt2_udata;
-    const H5A_dense_bt2_name_rec_t *bt2_rec = (const H5A_dense_bt2_name_rec_t *)_bt2_rec;
-    herr_t ret_value = SUCCEED;            /* Return value */
+    const H5A_bt2_ud_common_t *     bt2_udata = (const H5A_bt2_ud_common_t *)_bt2_udata;
+    const H5A_dense_bt2_name_rec_t *bt2_rec   = (const H5A_dense_bt2_name_rec_t *)_bt2_rec;
+    herr_t                          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -260,38 +247,38 @@ H5A_dense_btree2_name_compare(const void *_bt2_udata, const void *_bt2_rec, int
     HDassert(bt2_rec);
 
     /* Check hash value */
-    if(bt2_udata->name_hash < bt2_rec->hash)
+    if (bt2_udata->name_hash < bt2_rec->hash)
         *result = (-1);
-    else if(bt2_udata->name_hash > bt2_rec->hash)
+    else if (bt2_udata->name_hash > bt2_rec->hash)
         *result = 1;
     else {
-        H5A_fh_ud_cmp_t fh_udata;       /* User data for fractal heap 'op' callback */
-        H5HF_t *fheap;                  /* Fractal heap handle to use for finding object */
+        H5A_fh_ud_cmp_t fh_udata; /* User data for fractal heap 'op' callback */
+        H5HF_t *        fheap;    /* Fractal heap handle to use for finding object */
 
         /* Sanity check */
         HDassert(bt2_udata->name_hash == bt2_rec->hash);
 
         /* Prepare user data for callback */
         /* down */
-        fh_udata.f = bt2_udata->f;
-        fh_udata.dxpl_id = bt2_udata->dxpl_id;
-        fh_udata.name = bt2_udata->name;
-        fh_udata.record = bt2_rec;
-        fh_udata.found_op = bt2_udata->found_op;
+        fh_udata.f             = bt2_udata->f;
+        fh_udata.dxpl_id       = bt2_udata->dxpl_id;
+        fh_udata.name          = bt2_udata->name;
+        fh_udata.record        = bt2_rec;
+        fh_udata.found_op      = bt2_udata->found_op;
         fh_udata.found_op_data = bt2_udata->found_op_data;
 
         /* up */
         fh_udata.cmp = 0;
 
         /* Check for attribute in shared storage */
-        if(bt2_rec->flags & H5O_MSG_FLAG_SHARED)
+        if (bt2_rec->flags & H5O_MSG_FLAG_SHARED)
             fheap = bt2_udata->shared_fheap;
         else
             fheap = bt2_udata->fheap;
         HDassert(fheap);
 
         /* Check if the user's attribute and the B-tree's attribute have the same name */
-        if(H5HF_op(fheap, bt2_udata->dxpl_id, &bt2_rec->id, H5A_dense_fh_name_cmp, &fh_udata) < 0)
+        if (H5HF_op(fheap, bt2_udata->dxpl_id, &bt2_rec->id, H5A_dense_fh_name_cmp, &fh_udata) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTCOMPARE, FAIL, "can't compare btree2 records")
 
         /* Callback will set comparison value */
@@ -302,7 +289,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5A_dense_btree2_name_compare() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_dense_btree2_name_encode
  *
@@ -333,7 +319,6 @@ H5A_dense_btree2_name_encode(uint8_t *raw, const void *_nrecord, void H5_ATTR_UN
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5A_dense_btree2_name_encode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_dense_btree2_name_decode
  *
@@ -364,7 +349,6 @@ H5A_dense_btree2_name_decode(const uint8_t *raw, void *_nrecord, void H5_ATTR_UN
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5A_dense_btree2_name_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_dense_btree2_name_debug
  *
@@ -380,20 +364,19 @@ H5A_dense_btree2_name_decode(const uint8_t *raw, void *_nrecord, void H5_ATTR_UN
  */
 static herr_t
 H5A_dense_btree2_name_debug(FILE *stream, const H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id,
-    int indent, int fwidth, const void *_nrecord, const void H5_ATTR_UNUSED *_udata)
+                            int indent, int fwidth, const void *_nrecord, const void H5_ATTR_UNUSED *_udata)
 {
     const H5A_dense_bt2_name_rec_t *nrecord = (const H5A_dense_bt2_name_rec_t *)_nrecord;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     HDfprintf(stream, "%*s%-*s {%016Hx, %02x, %u, %08lx}\n", indent, "", fwidth,
-        "Record:",
-        (hsize_t)nrecord->id.val, (unsigned)nrecord->flags, (unsigned)nrecord->corder, (unsigned long)nrecord->hash);
+              "Record:", (hsize_t)nrecord->id.val, (unsigned)nrecord->flags, (unsigned)nrecord->corder,
+              (unsigned long)nrecord->hash);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5A_dense_btree2_name_debug() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_dense_btree2_corder_store
  *
@@ -410,20 +393,19 @@ H5A_dense_btree2_name_debug(FILE *stream, const H5F_t H5_ATTR_UNUSED *f, hid_t H
 static herr_t
 H5A_dense_btree2_corder_store(void *_nrecord, const void *_udata)
 {
-    const H5A_bt2_ud_ins_t *udata = (const H5A_bt2_ud_ins_t *)_udata;
+    const H5A_bt2_ud_ins_t *    udata   = (const H5A_bt2_ud_ins_t *)_udata;
     H5A_dense_bt2_corder_rec_t *nrecord = (H5A_dense_bt2_corder_rec_t *)_nrecord;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Copy user information info native record */
-    nrecord->id = udata->id;
-    nrecord->flags = udata->common.flags;
+    nrecord->id     = udata->id;
+    nrecord->flags  = udata->common.flags;
     nrecord->corder = udata->common.corder;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5A_dense_btree2_corder_store() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_dense_btree2_corder_compare
  *
@@ -441,8 +423,8 @@ H5A_dense_btree2_corder_store(void *_nrecord, const void *_udata)
 static herr_t
 H5A_dense_btree2_corder_compare(const void *_bt2_udata, const void *_bt2_rec, int *result)
 {
-    const H5A_bt2_ud_common_t *bt2_udata = (const H5A_bt2_ud_common_t *)_bt2_udata;
-    const H5A_dense_bt2_corder_rec_t *bt2_rec = (const H5A_dense_bt2_corder_rec_t *)_bt2_rec;
+    const H5A_bt2_ud_common_t *       bt2_udata = (const H5A_bt2_ud_common_t *)_bt2_udata;
+    const H5A_dense_bt2_corder_rec_t *bt2_rec   = (const H5A_dense_bt2_corder_rec_t *)_bt2_rec;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -451,9 +433,9 @@ H5A_dense_btree2_corder_compare(const void *_bt2_udata, const void *_bt2_rec, in
     HDassert(bt2_rec);
 
     /* Check creation order value */
-    if(bt2_udata->corder < bt2_rec->corder)
+    if (bt2_udata->corder < bt2_rec->corder)
         *result = -1;
-    else if(bt2_udata->corder > bt2_rec->corder)
+    else if (bt2_udata->corder > bt2_rec->corder)
         *result = 1;
     else
         *result = 0;
@@ -461,7 +443,6 @@ H5A_dense_btree2_corder_compare(const void *_bt2_udata, const void *_bt2_rec, in
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5A_dense_btree2_corder_compare() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_dense_btree2_corder_encode
  *
@@ -491,7 +472,6 @@ H5A_dense_btree2_corder_encode(uint8_t *raw, const void *_nrecord, void H5_ATTR_
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5A_dense_btree2_corder_encode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_dense_btree2_corder_decode
  *
@@ -521,7 +501,6 @@ H5A_dense_btree2_corder_decode(const uint8_t *raw, void *_nrecord, void H5_ATTR_
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5A_dense_btree2_corder_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5A_dense_btree2_corder_debug
  *
@@ -537,16 +516,14 @@ H5A_dense_btree2_corder_decode(const uint8_t *raw, void *_nrecord, void H5_ATTR_
  */
 static herr_t
 H5A_dense_btree2_corder_debug(FILE *stream, const H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id,
-    int indent, int fwidth, const void *_nrecord, const void H5_ATTR_UNUSED *_udata)
+                              int indent, int fwidth, const void *_nrecord, const void H5_ATTR_UNUSED *_udata)
 {
     const H5A_dense_bt2_corder_rec_t *nrecord = (const H5A_dense_bt2_corder_rec_t *)_nrecord;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    HDfprintf(stream, "%*s%-*s {%016Hx, %02x, %u}\n", indent, "", fwidth,
-        "Record:",
-        (hsize_t)nrecord->id.val, (unsigned)nrecord->flags, (unsigned)nrecord->corder);
+    HDfprintf(stream, "%*s%-*s {%016Hx, %02x, %u}\n", indent, "", fwidth, "Record:", (hsize_t)nrecord->id.val,
+              (unsigned)nrecord->flags, (unsigned)nrecord->corder);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5A_dense_btree2_corder_debug() */
-