diff options
Diffstat (limited to 'src/H5HFtiny.c')
| -rw-r--r-- | src/H5HFtiny.c | 102 |
1 files changed, 42 insertions, 60 deletions
diff --git a/src/H5HFtiny.c b/src/H5HFtiny.c index 21da6da..2bf152d 100644 --- a/src/H5HFtiny.c +++ b/src/H5HFtiny.c @@ -26,62 +26,52 @@ /* Module Setup */ /****************/ -#include "H5HFmodule.h" /* This source code file is part of the H5HF module */ - +#include "H5HFmodule.h" /* This source code file is part of the H5HF module */ /***********/ /* Headers */ /***********/ -#include "H5private.h" /* Generic Functions */ -#include "H5Eprivate.h" /* Error handling */ -#include "H5HFpkg.h" /* Fractal heaps */ -#include "H5MMprivate.h" /* Memory management */ - +#include "H5private.h" /* Generic Functions */ +#include "H5Eprivate.h" /* Error handling */ +#include "H5HFpkg.h" /* Fractal heaps */ +#include "H5MMprivate.h" /* Memory management */ /****************/ /* Local Macros */ /****************/ /* Tiny object length information */ -#define H5HF_TINY_LEN_SHORT 16 /* Max. length able to be encoded in first heap ID byte */ -#define H5HF_TINY_MASK_SHORT 0x0F /* Mask for length in first heap ID byte */ -#define H5HF_TINY_MASK_EXT 0x0FFF /* Mask for length in two heap ID bytes */ -#define H5HF_TINY_MASK_EXT_1 0x0F00 /* Mask for length in first byte of two heap ID bytes */ -#define H5HF_TINY_MASK_EXT_2 0x00FF /* Mask for length in second byte of two heap ID bytes */ - +#define H5HF_TINY_LEN_SHORT 16 /* Max. length able to be encoded in first heap ID byte */ +#define H5HF_TINY_MASK_SHORT 0x0F /* Mask for length in first heap ID byte */ +#define H5HF_TINY_MASK_EXT 0x0FFF /* Mask for length in two heap ID bytes */ +#define H5HF_TINY_MASK_EXT_1 0x0F00 /* Mask for length in first byte of two heap ID bytes */ +#define H5HF_TINY_MASK_EXT_2 0x00FF /* Mask for length in second byte of two heap ID bytes */ /******************/ /* Local Typedefs */ /******************/ - /********************/ /* Package Typedefs */ /********************/ - /********************/ /* Local Prototypes */ /********************/ -static herr_t H5HF__tiny_op_real(H5HF_hdr_t *hdr, const uint8_t *id, - H5HF_operator_t op, void *op_data); - +static herr_t H5HF__tiny_op_real(H5HF_hdr_t *hdr, const uint8_t *id, H5HF_operator_t op, void *op_data); /*********************/ /* Package Variables */ /*********************/ - /*****************************/ /* Library Private Variables */ /*****************************/ - /*******************/ /* Local Variables */ /*******************/ - /*------------------------------------------------------------------------- * Function: H5HF__tiny_init * @@ -111,23 +101,22 @@ H5HF__tiny_init(H5HF_hdr_t *hdr) * extra byte, but using that byte means that the extra length byte is * unnecessary) */ - if((hdr->id_len - 1) <= H5HF_TINY_LEN_SHORT) { - hdr->tiny_max_len = hdr->id_len - 1; + if ((hdr->id_len - 1) <= H5HF_TINY_LEN_SHORT) { + hdr->tiny_max_len = hdr->id_len - 1; hdr->tiny_len_extended = FALSE; } /* end if */ - else if((hdr->id_len - 1) == (H5HF_TINY_LEN_SHORT + 1)) { - hdr->tiny_max_len = H5HF_TINY_LEN_SHORT; + else if ((hdr->id_len - 1) == (H5HF_TINY_LEN_SHORT + 1)) { + hdr->tiny_max_len = H5HF_TINY_LEN_SHORT; hdr->tiny_len_extended = FALSE; } /* end if */ else { - hdr->tiny_max_len = hdr->id_len - 2; + hdr->tiny_max_len = hdr->id_len - 2; hdr->tiny_len_extended = TRUE; } /* end else */ FUNC_LEAVE_NOAPI(SUCCEED) } /* end H5HF__tiny_init() */ - /*------------------------------------------------------------------------- * Function: H5HF__tiny_insert * @@ -143,9 +132,9 @@ H5HF__tiny_init(H5HF_hdr_t *hdr) herr_t H5HF__tiny_insert(H5HF_hdr_t *hdr, size_t obj_size, const void *obj, void *_id) { - uint8_t *id = (uint8_t *)_id; /* Pointer to ID buffer */ - size_t enc_obj_size; /* Encoded object size */ - herr_t ret_value = SUCCEED; /* Return value */ + uint8_t *id = (uint8_t *)_id; /* Pointer to ID buffer */ + size_t enc_obj_size; /* Encoded object size */ + herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -162,13 +151,12 @@ H5HF__tiny_insert(H5HF_hdr_t *hdr, size_t obj_size, const void *obj, void *_id) enc_obj_size = obj_size - 1; /* Encode object into ID */ - if(!hdr->tiny_len_extended) { - *id++ = (uint8_t)(H5HF_ID_VERS_CURR | H5HF_ID_TYPE_TINY | - (enc_obj_size & H5HF_TINY_MASK_SHORT)); + if (!hdr->tiny_len_extended) { + *id++ = (uint8_t)(H5HF_ID_VERS_CURR | H5HF_ID_TYPE_TINY | (enc_obj_size & H5HF_TINY_MASK_SHORT)); } /* end if */ else { - *id++ = (uint8_t)(H5HF_ID_VERS_CURR | H5HF_ID_TYPE_TINY | - ((enc_obj_size & H5HF_TINY_MASK_EXT_1) >> 8)); + *id++ = + (uint8_t)(H5HF_ID_VERS_CURR | H5HF_ID_TYPE_TINY | ((enc_obj_size & H5HF_TINY_MASK_EXT_1) >> 8)); *id++ = enc_obj_size & H5HF_TINY_MASK_EXT_2; } /* end else */ @@ -180,14 +168,13 @@ H5HF__tiny_insert(H5HF_hdr_t *hdr, size_t obj_size, const void *obj, void *_id) hdr->tiny_nobjs++; /* Mark heap header as modified */ - if(H5HF__hdr_dirty(hdr) < 0) + if (H5HF__hdr_dirty(hdr) < 0) HGOTO_ERROR(H5E_HEAP, H5E_CANTDIRTY, FAIL, "can't mark heap header as dirty") done: FUNC_LEAVE_NOAPI(ret_value) } /* end H5HF__tiny_insert() */ - /*------------------------------------------------------------------------- * Function: H5HF__tiny_get_obj_len * @@ -203,7 +190,7 @@ done: herr_t H5HF__tiny_get_obj_len(H5HF_hdr_t *hdr, const uint8_t *id, size_t *obj_len_p) { - size_t enc_obj_size; /* Encoded object size */ + size_t enc_obj_size; /* Encoded object size */ FUNC_ENTER_PACKAGE_NOERR @@ -215,13 +202,13 @@ H5HF__tiny_get_obj_len(H5HF_hdr_t *hdr, const uint8_t *id, size_t *obj_len_p) HDassert(obj_len_p); /* Check if 'tiny' object ID is in extended form, and retrieve encoded size */ - if(!hdr->tiny_len_extended) + if (!hdr->tiny_len_extended) enc_obj_size = *id & H5HF_TINY_MASK_SHORT; else /* (performed in this odd way to avoid compiler bug on tg-login3 with * gcc 3.2.2 - QAK) */ - enc_obj_size = (size_t)*(id + 1) | ((size_t)(*id & H5HF_TINY_MASK_EXT_1) << 8); + enc_obj_size = (size_t) * (id + 1) | ((size_t)(*id & H5HF_TINY_MASK_EXT_1) << 8); /* Set the object's length */ *obj_len_p = enc_obj_size + 1; @@ -229,7 +216,6 @@ H5HF__tiny_get_obj_len(H5HF_hdr_t *hdr, const uint8_t *id, size_t *obj_len_p) FUNC_LEAVE_NOAPI(SUCCEED) } /* end H5HF__tiny_get_obj_len() */ - /*------------------------------------------------------------------------- * Function: H5HF__tiny_op_real * @@ -243,11 +229,10 @@ H5HF__tiny_get_obj_len(H5HF_hdr_t *hdr, const uint8_t *id, size_t *obj_len_p) *------------------------------------------------------------------------- */ static herr_t -H5HF__tiny_op_real(H5HF_hdr_t *hdr, const uint8_t *id, H5HF_operator_t op, - void *op_data) +H5HF__tiny_op_real(H5HF_hdr_t *hdr, const uint8_t *id, H5HF_operator_t op, void *op_data) { - size_t enc_obj_size; /* Encoded object size */ - herr_t ret_value = SUCCEED; /* Return value */ + size_t enc_obj_size; /* Encoded object size */ + herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_STATIC @@ -263,24 +248,24 @@ H5HF__tiny_op_real(H5HF_hdr_t *hdr, const uint8_t *id, H5HF_operator_t op, ret_value = H5HF__tiny_get_obj_len(hdr, id, &enc_obj_size); /* Advance past flag byte(s) */ - if(!hdr->tiny_len_extended) + if (!hdr->tiny_len_extended) id++; else { /* (performed in two steps to avoid compiler bug on tg-login3 with * gcc 3.2.2 - QAK) */ - id++; id++; + id++; + id++; } /* Call the user's 'op' callback */ - if(op(id, enc_obj_size, op_data) < 0) + if (op(id, enc_obj_size, op_data) < 0) HGOTO_ERROR(H5E_HEAP, H5E_CANTOPERATE, FAIL, "application's callback failed") done: FUNC_LEAVE_NOAPI(ret_value) } /* end H5HF__tiny_op_real() */ - /*------------------------------------------------------------------------- * Function: H5HF__tiny_read * @@ -296,7 +281,7 @@ done: herr_t H5HF__tiny_read(H5HF_hdr_t *hdr, const uint8_t *id, void *obj) { - herr_t ret_value = SUCCEED; /* Return value */ + herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -308,14 +293,13 @@ H5HF__tiny_read(H5HF_hdr_t *hdr, const uint8_t *id, void *obj) HDassert(obj); /* Call the internal 'op' routine */ - if(H5HF__tiny_op_real(hdr, id, H5HF__op_read, obj) < 0) + if (H5HF__tiny_op_real(hdr, id, H5HF__op_read, obj) < 0) HGOTO_ERROR(H5E_HEAP, H5E_CANTOPERATE, FAIL, "unable to operate on heap object") done: FUNC_LEAVE_NOAPI(ret_value) } /* end H5HF__tiny_read() */ - /*------------------------------------------------------------------------- * Function: H5HF__tiny_op * @@ -329,10 +313,9 @@ done: *------------------------------------------------------------------------- */ herr_t -H5HF__tiny_op(H5HF_hdr_t *hdr, const uint8_t *id, H5HF_operator_t op, - void *op_data) +H5HF__tiny_op(H5HF_hdr_t *hdr, const uint8_t *id, H5HF_operator_t op, void *op_data) { - herr_t ret_value = SUCCEED; /* Return value */ + herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -344,14 +327,13 @@ H5HF__tiny_op(H5HF_hdr_t *hdr, const uint8_t *id, H5HF_operator_t op, HDassert(op); /* Call the internal 'op' routine routine */ - if(H5HF__tiny_op_real(hdr, id, op, op_data) < 0) + if (H5HF__tiny_op_real(hdr, id, op, op_data) < 0) HGOTO_ERROR(H5E_HEAP, H5E_CANTOPERATE, FAIL, "unable to operate on heap object") done: FUNC_LEAVE_NOAPI(ret_value) } /* end H5HF__tiny_op() */ - /*------------------------------------------------------------------------- * Function: H5HF__tiny_remove * @@ -367,8 +349,8 @@ done: herr_t H5HF__tiny_remove(H5HF_hdr_t *hdr, const uint8_t *id) { - size_t enc_obj_size; /* Encoded object size */ - herr_t ret_value = SUCCEED; /* Return value */ + size_t enc_obj_size; /* Encoded object size */ + herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE @@ -387,7 +369,7 @@ H5HF__tiny_remove(H5HF_hdr_t *hdr, const uint8_t *id) hdr->tiny_nobjs--; /* Mark heap header as modified */ - if(H5HF__hdr_dirty(hdr) < 0) + if (H5HF__hdr_dirty(hdr) < 0) HGOTO_ERROR(H5E_HEAP, H5E_CANTDIRTY, FAIL, "can't mark heap header as dirty") done: |