diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5Dint.c | 150 | ||||
| -rw-r--r-- | src/H5F.c | 33 | ||||
| -rw-r--r-- | src/H5Oint.c | 162 | ||||
| -rw-r--r-- | src/H5Pdcpl.c | 32 | ||||
| -rw-r--r-- | src/H5VLnative.c | 3 |
5 files changed, 104 insertions, 276 deletions
diff --git a/src/H5Dint.c b/src/H5Dint.c index 793b3ed..44c40b0 100644 --- a/src/H5Dint.c +++ b/src/H5Dint.c @@ -676,10 +676,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5D__use_minimized_dset_headers( \ - H5F_t *file, \ - H5D_t *dset, \ - hbool_t *minimize) +H5D__use_minimized_dset_headers(H5F_t *file, H5D_t *dset, hbool_t *minimize) { H5P_genplist_t *plist = NULL; herr_t ret_value = SUCCEED; @@ -692,15 +689,12 @@ H5D__use_minimized_dset_headers( \ plist = H5P_object_verify(dset->shared->dcpl_id, H5P_DATASET_CREATE); if (NULL == plist) - HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, - "problem getting dcpl") + HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "problem getting dcpl") if (FAIL == H5P_get(plist, H5D_CRT_MIN_DSET_HDR_SIZE_NAME, minimize)) - HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, - "can't get minimize value from dcpl") + HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get minimize value from dcpl") - if (FALSE == *minimize) { + if (FALSE == *minimize) *minimize = H5F_get_min_dset_ohdr(file); - } done: if (FAIL == ret_value) @@ -722,10 +716,7 @@ done: *------------------------------------------------------------------------- */ static size_t -H5D__calculate_minimum_header_size( \ - H5F_t *file, \ - H5D_t *dset, \ - H5O_t *ohdr) +H5D__calculate_minimum_header_size(H5F_t *file, H5D_t *dset, H5O_t *ohdr) { H5T_t *type = NULL; H5O_fill_t *fill_prop = NULL; @@ -744,47 +735,22 @@ H5D__calculate_minimum_header_size( \ use_at_least_v18 = (H5F_LOW_BOUND(file) >= H5F_LIBVER_V18); /* Datatype message size */ - ret_value += H5O_msg_size_oh( - file, - ohdr, - H5O_DTYPE_ID, - type, - 0); + ret_value += H5O_msg_size_oh(file, ohdr, H5O_DTYPE_ID, type, 0); /* Shared Dataspace message size */ - ret_value += H5O_msg_size_oh( - file, - ohdr, - H5O_SDSPACE_ID, - dset->shared->space, - 0); + ret_value += H5O_msg_size_oh(file, ohdr, H5O_SDSPACE_ID, dset->shared->space, 0); /* "Layout" message size */ - ret_value += H5O_msg_size_oh( - file, - ohdr, - H5O_LAYOUT_ID, - &dset->shared->layout, - 0); + ret_value += H5O_msg_size_oh(file, ohdr, H5O_LAYOUT_ID, &dset->shared->layout, 0); /* Fill Value message size */ - ret_value += H5O_msg_size_oh( - file, - ohdr, - H5O_FILL_NEW_ID, - fill_prop, - 0); + ret_value += H5O_msg_size_oh(file, ohdr, H5O_FILL_NEW_ID, fill_prop, 0); /* "Continuation" message size */ /* message pointer "continuation" is unused by raw get function, however, * a null pointer would be intercepted by an assert in H5O_msg_size_oh(). */ - ret_value += H5O_msg_size_oh( - file, - ohdr, - H5O_CONT_ID, - continuation, - 0); + ret_value += H5O_msg_size_oh(file, ohdr, H5O_CONT_ID, continuation, 0); /* Fill Value (backwards compatability) message size */ if (fill_prop->buf && !use_at_least_v18) { @@ -796,51 +762,28 @@ H5D__calculate_minimum_header_size( \ H5O_msg_reset_share(H5O_FILL_ID, &old_fill_prop); - ret_value += H5O_msg_size_oh( - file, - ohdr, - H5O_FILL_ID, - &old_fill_prop, - 0); + ret_value += H5O_msg_size_oh(file, ohdr, H5O_FILL_ID, &old_fill_prop, 0); } /* Filter/Pipeline message size */ if (H5D_CHUNKED == dset->shared->layout.type) { H5O_pline_t *pline = &dset->shared->dcpl_cache.pline; - if (pline->nused > 0) { - ret_value += H5O_msg_size_oh( - file, - ohdr, - H5O_PLINE_ID, - pline, - 0); - } + if (pline->nused > 0) + ret_value += H5O_msg_size_oh(file, ohdr, H5O_PLINE_ID, pline, 0); } /* External File Link message size */ - if (dset->shared->dcpl_cache.efl.nused > 0) { - ret_value += H5O_msg_size_oh( - file, - ohdr, - H5O_EFL_ID, - &dset->shared->dcpl_cache.efl, - 0); - } + if (dset->shared->dcpl_cache.efl.nused > 0) + ret_value += H5O_msg_size_oh(file, ohdr, H5O_EFL_ID, &dset->shared->dcpl_cache.efl, 0); /* Modification Time message size */ if (H5O_HDR_STORE_TIMES & H5O_OH_GET_FLAGS(ohdr)) { - /* TODO: 1 -> H5O_VERSION_1 in H5Opkg.h */ - HDassert(H5O_OH_GET_VERSION(ohdr) >= 1); + HDassert(H5O_OH_GET_VERSION(ohdr) >= 1); /* 1 :: H5O_VERSION_1 (H5Opkg.h) */ if (H5O_OH_GET_VERSION(ohdr) == 1) { /* v1 object headers store modification time as a message */ time_t mtime; - ret_value += H5O_msg_size_oh( - file, - ohdr, - H5O_MTIME_NEW_ID, - &mtime, - 0); + ret_value += H5O_msg_size_oh(file, ohdr, H5O_MTIME_NEW_ID, &mtime, 0); } } @@ -862,10 +805,7 @@ H5D__calculate_minimum_header_size( \ *------------------------------------------------------------------------- */ static herr_t -H5D__prepare_minimized_oh( \ - H5F_t *file, \ - H5D_t *dset, \ - H5O_loc_t *oloc) +H5D__prepare_minimized_oh(H5F_t *file, H5D_t *dset, H5O_loc_t *oloc) { H5O_t *oh = NULL; size_t ohdr_size = 0; @@ -879,20 +819,12 @@ H5D__prepare_minimized_oh( \ oh = H5O__create_ohdr(file, dset->shared->dcpl_id); if (NULL == oh) - HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, FAIL, - "can't instantiate object header") + HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, FAIL, "can't instantiate object header") ohdr_size = H5D__calculate_minimum_header_size(file, dset, oh); - if (FAIL == H5O__apply_ohdr( - file, - oh, - dset->shared->dcpl_id, - ohdr_size, - (size_t)1, - oloc)) - HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, FAIL, - "can't apply object header to file") + if (FAIL == H5O__apply_ohdr(file, oh, dset->shared->dcpl_id, ohdr_size, (size_t)1, oloc)) + HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, FAIL, "can't apply object header to file") done: FUNC_LEAVE_NOAPI(ret_value); @@ -911,18 +843,18 @@ done: static herr_t H5D__update_oh_info(H5F_t *file, H5D_t *dset, hid_t dapl_id) { - H5O_t *oh = NULL; /* Pointer to dataset's object header */ - size_t ohdr_size = H5D_MINHDR_SIZE; /* Size of dataset's object header */ - H5O_loc_t *oloc = NULL; /* Dataset's object location */ - H5O_layout_t *layout; /* Dataset's layout information */ - H5T_t *type; /* Dataset's datatype */ - H5O_fill_t *fill_prop; /* Pointer to dataset's fill value information */ - H5D_fill_value_t fill_status; /* Fill value status */ - hbool_t fill_changed = FALSE; /* Flag indicating the fill value was changed */ - hbool_t layout_init = FALSE; /* Flag to indicate that chunk information was initialized */ - hbool_t use_at_least_v18; /* Flag indicating to use at least v18 format versions */ - hbool_t minimize_header = FALSE; - herr_t ret_value = SUCCEED; /* Return value */ + H5O_t *oh = NULL; /* Pointer to dataset's object header */ + size_t ohdr_size = H5D_MINHDR_SIZE; /* Size of dataset's object header */ + H5O_loc_t *oloc = NULL; /* Dataset's object location */ + H5O_layout_t *layout; /* Dataset's layout information */ + H5T_t *type; /* Dataset's datatype */ + H5O_fill_t *fill_prop; /* Pointer to dataset's fill value information */ + H5D_fill_value_t fill_status; /* Fill value status */ + hbool_t fill_changed = FALSE; /* Flag indicating the fill value was changed */ + hbool_t layout_init = FALSE; /* Flag to indicate that chunk information was initialized */ + hbool_t use_at_least_v18; /* Flag indicating to use at least v18 format versions */ + hbool_t minimize_header = FALSE; + herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_STATIC @@ -991,12 +923,10 @@ H5D__update_oh_info(H5F_t *file, H5D_t *dset, hid_t dapl_id) } /* end if */ if (FAIL == H5D__use_minimized_dset_headers(file, dset, &minimize_header)) - HGOTO_ERROR(H5E_ARGS, H5E_CANTGET, FAIL, - "can't get minimize settings") + HGOTO_ERROR(H5E_ARGS, H5E_CANTGET, FAIL, "can't get minimize settings") if (TRUE == minimize_header) { if (FAIL == H5D__prepare_minimized_oh(file, dset, oloc)) - HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, - "can't create minimized dataset object header") + HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't create minimized dataset object header") } else { /* Add the dataset's raw data size to the size of the header, if the * raw data will be stored as compact @@ -1005,14 +935,8 @@ H5D__update_oh_info(H5F_t *file, H5D_t *dset, hid_t dapl_id) ohdr_size += layout->storage.u.compact.size; /* Create an object header for the dataset */ - if (0 > H5O_create( - file, - ohdr_size, - (size_t)1, - dset->shared->dcpl_id, - oloc/*out*/)) - HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, - "unable to create dataset object header") + if (0 > H5O_create(file, ohdr_size, (size_t)1, dset->shared->dcpl_id, oloc/*out*/)) + HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create dataset object header") } /* If use minimum/standard object header space */ HDassert(file == dset->oloc.file); @@ -1843,8 +1843,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Fget_dset_no_attrs_hint(hid_t file_id, - hbool_t *minimize) +H5Fget_dset_no_attrs_hint(hid_t file_id, hbool_t *minimize) { H5VL_object_t *vol_obj = NULL; herr_t ret_value = SUCCEED; @@ -1853,23 +1852,14 @@ H5Fget_dset_no_attrs_hint(hid_t file_id, H5TRACE2("e", "i*b", file_id, minimize); if (NULL == minimize) - HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, - "out pointer 'minimize' cannot be NULL") + HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "out pointer 'minimize' cannot be NULL") vol_obj = (H5VL_object_t *)H5I_object(file_id); if (NULL == vol_obj) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid file identifier") - if (0 > H5VL_file_get( - vol_obj, - H5VL_FILE_GET_MIN_DSET_OHDR_FLAG, - H5P_DATASET_XFER_DEFAULT, - H5_REQUEST_NULL, - minimize)) - { - HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, - "unable to get file's dataset header minimization flag") - } + if (0 > H5VL_file_get(vol_obj, H5VL_FILE_GET_MIN_DSET_OHDR_FLAG, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, minimize)) + HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "unable to get file's dataset header minimization flag") done: FUNC_LEAVE_API(ret_value) @@ -1897,8 +1887,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Fset_dset_no_attrs_hint(hid_t file_id, - hbool_t minimize) +H5Fset_dset_no_attrs_hint(hid_t file_id, hbool_t minimize) { H5VL_object_t *vol_obj = NULL; herr_t ret_value = SUCCEED; @@ -1910,16 +1899,8 @@ H5Fset_dset_no_attrs_hint(hid_t file_id, if (NULL == vol_obj) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid file identifier") - if (0 > H5VL_file_optional( - vol_obj, - H5P_DATASET_XFER_DEFAULT, - H5_REQUEST_NULL, - H5VL_FILE_SET_MIN_DSET_OHDR_FLAG, - minimize)) - { - HGOTO_ERROR(H5E_FILE, H5E_CANTSET, FAIL, - "unable to set file's dataset header minimization flag") - } + if (0 > H5VL_file_optional(vol_obj, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, H5VL_FILE_SET_MIN_DSET_OHDR_FLAG, minimize)) + HGOTO_ERROR(H5E_FILE, H5E_CANTSET, FAIL, "unable to set file's dataset header minimization flag") done: FUNC_LEAVE_API(ret_value) diff --git a/src/H5Oint.c b/src/H5Oint.c index aa96cb4..0020642 100644 --- a/src/H5Oint.c +++ b/src/H5Oint.c @@ -276,7 +276,7 @@ done: * matzke@llnl.gov * Aug 5 1997 * - * Changes: 17 August 2018 + * Changes: 2018 August 17 * Jacob Smith * Refactor out the operations into two separate steps -- * preparation and application -- to facilitate overriding the @@ -287,12 +287,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5O_create( \ - H5F_t *f, \ - size_t size_hint, \ - size_t initial_rc, \ - hid_t ocpl_id, \ - H5O_loc_t *loc) /*out*/ +H5O_create(H5F_t *f, size_t size_hint, size_t initial_rc, hid_t ocpl_id, H5O_loc_t *loc /*out*/) { H5O_t *oh = NULL; herr_t ret_value = SUCCEED; @@ -308,31 +303,16 @@ H5O_create( \ */ oh = H5O__create_ohdr(f, ocpl_id); if (NULL == oh) - HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, FAIL, - "Can't instantiate object header") + HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, FAIL, "Can't instantiate object header") /* apply object header information to file */ - if (0 > H5O__apply_ohdr( - f, - oh, - ocpl_id, - size_hint, - initial_rc, - loc)) - { - HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, FAIL, - "Can't apply object header to file") - } + if (0 > H5O__apply_ohdr(f, oh, ocpl_id, size_hint, initial_rc, loc)) + HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, FAIL, "Can't apply object header to file") done: - if (FAIL == ret_value && - NULL != oh && - 0 > H5O__free(oh)) - { - HDONE_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL, - "can't delete object header") - } + if ((FAIL == ret_value) && (NULL != oh) && (0 > H5O__free(oh))) + HDONE_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL, "can't delete object header") FUNC_LEAVE_NOAPI(ret_value) } /* end H5O_create() */ @@ -347,14 +327,12 @@ done: * Failure: NULL * * Programmer: Jacob Smith - * 17 August 2018 + * 2018 August 17 * *----------------------------------------------------------------------------- */ H5O_t * -H5O__create_ohdr( \ - H5F_t *f, \ - hid_t ocpl_id) +H5O__create_ohdr(H5F_t *f, hid_t ocpl_id) { H5P_genplist_t *oc_plist; H5O_t *oh = NULL; /* Object header in Freelist */ @@ -368,43 +346,33 @@ H5O__create_ohdr( \ /* Check for invalid access request */ if (0 == (H5F_INTENT(f) & H5F_ACC_RDWR)) - HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, NULL, - "no write intent on file") + HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, NULL, "no write intent on file") oh = H5FL_CALLOC(H5O_t); if (NULL == oh) - HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, - "memory allocation failed") + HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed") oc_plist = (H5P_genplist_t *)H5I_object(ocpl_id); if (NULL == oc_plist) - HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, NULL, - "not a property list") + HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, NULL, "not a property list") /* Get any object header status flags set by properties */ if (0 > H5P_get(oc_plist, H5O_CRT_OHDR_FLAGS_NAME, &oh_flags)) - HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, - "can't get object header flags") + HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get object header flags") if (0 > H5O_set_version(f, oh, oh_flags, H5F_STORE_MSG_CRT_IDX(f))) - HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, NULL, - "can't set version of object header") + HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, NULL, "can't set version of object header") oh->flags = oh_flags; ret_value = oh; done: - if (NULL == ret_value && - NULL != oh && - 0 > H5O__free(oh)) - { - HDONE_ERROR(H5E_OHDR, H5E_CANTFREE, NULL, - "can't delete object header") - } + if ((NULL == ret_value) && (NULL != oh) && (0 > H5O__free(oh))) + HDONE_ERROR(H5E_OHDR, H5E_CANTFREE, NULL, "can't delete object header") FUNC_LEAVE_NOAPI(ret_value) -} /* H5O__create_ohdr */ +} /* H5O__create_ohdr() */ /*----------------------------------------------------------------------------- @@ -414,21 +382,15 @@ done: * Record some information at `loc_out`. * * Return: Success: SUCCEED (0) (non-negative value) - * Failure: FAI (-1) (negative value) + * Failure: FAIL (-1) (negative value) * * Programmer: Jacob Smith - * 17 August 2018 + * 2018 August 17 * *----------------------------------------------------------------------------- */ herr_t -H5O__apply_ohdr( \ - H5F_t *f, \ - H5O_t *oh, \ - hid_t ocpl_id, \ - size_t size_hint, \ - size_t initial_rc, \ - H5O_loc_t *loc_out) +H5O__apply_ohdr(H5F_t *f, H5O_t *oh, hid_t ocpl_id, size_t size_hint, size_t initial_rc, H5O_loc_t *loc_out) { haddr_t oh_addr; size_t oh_size; @@ -451,32 +413,25 @@ H5O__apply_ohdr( \ oh->swmr_write = !!(H5F_INTENT(f) & H5F_ACC_SWMR_WRITE); /* funky cast */ #ifdef H5O_ENABLE_BAD_MESG_COUNT - if (0 < H5P_exist_plist(oc_plist, H5O_BAD_MESG_COUNT_NAME)) { - /* Set bad message count flag -- from property list */ - if (0 > H5P_get(oc_plist, - H5O_BAD_MESG_COUNT_NAME, - &oh->store_bad_mesg_count)) - { - HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, - "can't get bad message count flag") - } - } + /* Check whether the "bad message count" property is set */ + if (0 < H5P_exist_plist(oc_plist, H5O_BAD_MESG_COUNT_NAME)) + /* Get bad message count flag -- from property list */ + if (0 > H5P_get(oc_plist, H5O_BAD_MESG_COUNT_NAME, &oh->store_bad_mesg_count)) + HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't get bad message count flag") #endif /* H5O_ENABLE_BAD_MESG_COUNT */ /* Create object header proxy if doing SWMR writes */ if (oh->swmr_write) { oh->proxy = H5AC_proxy_entry_create(); if (NULL == oh->proxy) - HGOTO_ERROR(H5E_OHDR, H5E_CANTCREATE, FAIL, - "can't create object header proxy") + HGOTO_ERROR(H5E_OHDR, H5E_CANTCREATE, FAIL, "can't create object header proxy") } else { oh->proxy = NULL; } oc_plist = (H5P_genplist_t *)H5I_object(ocpl_id); if (NULL == oc_plist) - HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, - "not a property list") + HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a property list") /* Initialize version-specific fields */ if (oh->version > H5O_VERSION_1) { @@ -490,28 +445,15 @@ H5O__apply_ohdr( \ /* flag to record message creation indices */ oh->flags |= H5O_HDR_ATTR_CRT_ORDER_TRACKED; - /* Set attribute storage phase change values -- from property list */ - if (0 > H5P_get(oc_plist, - H5O_CRT_ATTR_MAX_COMPACT_NAME, - &oh->max_compact)) - { - HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, - "can't get max. # of compact attributes") - } - if (0 > H5P_get(oc_plist, - H5O_CRT_ATTR_MIN_DENSE_NAME, - &oh->min_dense)) - { - HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, - "can't get min. # of dense attributes") - } + /* Get attribute storage phase change values -- from property list */ + if (0 > H5P_get(oc_plist, H5O_CRT_ATTR_MAX_COMPACT_NAME, &oh->max_compact)) + HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get max. # of compact attributes") + if (0 > H5P_get(oc_plist, H5O_CRT_ATTR_MIN_DENSE_NAME, &oh->min_dense)) + HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get min. # of dense attributes") /* Check for non-default attribute storage phase change values */ - if (H5O_CRT_ATTR_MAX_COMPACT_DEF != oh->max_compact || \ - H5O_CRT_ATTR_MIN_DENSE_DEF != oh->min_dense ) - { + if (H5O_CRT_ATTR_MAX_COMPACT_DEF != oh->max_compact || H5O_CRT_ATTR_MIN_DENSE_DEF != oh->min_dense ) oh->flags |= H5O_HDR_ATTR_STORE_PHASE_CHANGE; - } /* Determine correct value for chunk #0 size bits */ /* Avoid compiler warning on 32-bit machines */ @@ -536,16 +478,14 @@ H5O__apply_ohdr( \ /* Allocate disk space for header and first chunk */ oh_addr = H5MF_alloc(f, H5FD_MEM_OHDR, (hsize_t)oh_size); if (HADDR_UNDEF == oh_addr) - HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, - "file allocation failed for object header") + HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "file allocation failed for object header") /* Create the chunk list */ oh->nchunks = 1; oh->alloc_nchunks = 1; oh->chunk = H5FL_SEQ_MALLOC(H5O_chunk_t, (size_t)oh->alloc_nchunks); if (NULL == oh->chunk) - HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, - "memory allocation failed") + HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed") /* Initialize the first chunk */ oh->chunk[0].addr = oh_addr; @@ -556,8 +496,7 @@ H5O__apply_ohdr( \ /* (including space for serializing the object header prefix */ oh->chunk[0].image = H5FL_BLK_CALLOC(chunk_image, oh_size); if(NULL == oh->chunk[0].image) - HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, - "memory allocation failed") + HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed") oh->chunk[0].chunk_proxy = NULL; /* Put magic # for object header in first chunk */ @@ -569,17 +508,13 @@ H5O__apply_ohdr( \ oh->alloc_nmesgs = H5O_NMESGS; oh->mesg = H5FL_SEQ_CALLOC(H5O_mesg_t, oh->alloc_nmesgs); if (NULL == oh->mesg) - HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, - "memory allocation failed") + HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed") /* Initialize the initial "null" message; covers the entire first chunk */ oh->mesg[0].type = H5O_MSG_NULL; oh->mesg[0].dirty = TRUE; oh->mesg[0].native = NULL; - oh->mesg[0].raw = oh->chunk[0].image \ - + H5O_SIZEOF_HDR(oh) \ - - H5O_SIZEOF_CHKSUM_OH(oh) \ - + H5O_SIZEOF_MSGHDR_OH(oh); + oh->mesg[0].raw = oh->chunk[0].image + H5O_SIZEOF_HDR(oh) - H5O_SIZEOF_CHKSUM_OH(oh) + H5O_SIZEOF_MSGHDR_OH(oh); oh->mesg[0].raw_size = size_hint - (size_t)H5O_SIZEOF_MSGHDR_OH(oh); oh->mesg[0].chunkno = 0; @@ -595,10 +530,8 @@ H5O__apply_ohdr( \ /* Cache object header */ if (0 > H5AC_insert_entry(f, H5AC_OHDR, oh_addr, oh, insert_flags)) - HGOTO_ERROR_TAG(H5E_OHDR, H5E_CANTINSERT, FAIL, - "unable to cache object header") + HGOTO_ERROR_TAG(H5E_OHDR, H5E_CANTINSERT, FAIL, "unable to cache object header") - /* TODO: is this relevant to the BEGIN/END TAG region? if not, delete */ /* Reset object header pointer, now that it's been inserted into the cache */ oh = NULL; @@ -610,12 +543,11 @@ H5O__apply_ohdr( \ loc_out->addr = oh_addr; if (0 > H5O_open(loc_out)) - HGOTO_ERROR(H5E_OHDR, H5E_CANTOPENOBJ, FAIL, - "unable to open object header") + HGOTO_ERROR(H5E_OHDR, H5E_CANTOPENOBJ, FAIL, "unable to open object header") done: FUNC_LEAVE_NOAPI(ret_value); -} /* H5O__apply_ohdr */ +} /* H5O__apply_ohdr() */ /*------------------------------------------------------------------------- @@ -2574,7 +2506,7 @@ H5O_get_oh_addr(const H5O_t *oh) * Function: H5O_get_oh_flags * * Programmer: Jacob Smith - * 17 August 2018 + * 2018 August 17 * *------------------------------------------------------------------------- */ @@ -2584,7 +2516,7 @@ H5O_get_oh_flags(const H5O_t *oh) FUNC_ENTER_NOAPI_NOINIT_NOERR HDassert(oh); FUNC_LEAVE_NOAPI(oh->flags); /* flags can be 0 */ -} +} /* H5O_get_oh_flags() */ /*------------------------------------------------------------------------- @@ -2595,7 +2527,7 @@ H5O_get_oh_flags(const H5O_t *oh) * to the header in question. * * Programmer: Jacob Smith - * 17 August 2018 + * 2018 August 17 * *------------------------------------------------------------------------- */ @@ -2606,14 +2538,14 @@ H5O_get_oh_mtime(const H5O_t *oh) HDassert(oh); HDassert(oh->mtime); FUNC_LEAVE_NOAPI(oh->mtime); -} +} /* H5O_get_oh_mtime() */ /*------------------------------------------------------------------------- * Function: H5O_get_oh_version * * Programmer: Jacob Smith - * 17 August 2018 + * 2018 August 17 * *------------------------------------------------------------------------- */ @@ -2624,7 +2556,7 @@ H5O_get_oh_version(const H5O_t *oh) HDassert(oh); HDassert(oh->version); FUNC_LEAVE_NOAPI(oh->version); -} +} /* H5O_get_oh_version() */ /*------------------------------------------------------------------------- diff --git a/src/H5Pdcpl.c b/src/H5Pdcpl.c index adb63c7..5f13bb5 100644 --- a/src/H5Pdcpl.c +++ b/src/H5Pdcpl.c @@ -3790,15 +3790,14 @@ done: * Success: Non-negative value (SUCCEED) * * Programmer: Jacob Smith - * 14 August 2018 + * 2018 August 14 * * Modifications: None. * *----------------------------------------------------------------------------- */ herr_t -H5Pget_dset_no_attrs_hint(hid_t dcpl_id, - hbool_t *minimize) +H5Pget_dset_no_attrs_hint(hid_t dcpl_id, hbool_t *minimize) { hbool_t setting = FALSE; H5P_genplist_t *plist = NULL; @@ -3808,23 +3807,20 @@ H5Pget_dset_no_attrs_hint(hid_t dcpl_id, H5TRACE2("e", "i*b", dcpl_id, minimize); if (NULL == minimize) - HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, - "receiving pointer cannot be NULL") + HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "receiving pointer cannot be NULL") plist = H5P_object_verify(dcpl_id, H5P_DATASET_CREATE); if (NULL == plist) - HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, - "can't find object for ID") + HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID") if (0 > H5P_peek(plist, H5D_CRT_MIN_DSET_HDR_SIZE_NAME, &setting)) - HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, - "can't get dset oh minimize flag value") + HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get dset oh minimize flag value") *minimize = setting; done: FUNC_LEAVE_API(ret_value) -} /* H5Pget_dset_no_attrs_hint */ +} /* H5Pget_dset_no_attrs_hint() */ /*----------------------------------------------------------------------------- @@ -3841,15 +3837,14 @@ done: * Success: Non-negative value (SUCCEED) * * Programmer: Jacob Smith - * 14 August 2018 + * 2018 August 14 * * Modifications: None. * *----------------------------------------------------------------------------- */ herr_t -H5Pset_dset_no_attrs_hint(hid_t dcpl_id, - hbool_t minimize) +H5Pset_dset_no_attrs_hint(hid_t dcpl_id, hbool_t minimize) { H5P_genplist_t *plist = NULL; hbool_t prev_set = FALSE; @@ -3860,18 +3855,15 @@ H5Pset_dset_no_attrs_hint(hid_t dcpl_id, plist = H5P_object_verify(dcpl_id, H5P_DATASET_CREATE); if (NULL == plist) - HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, - "can't find object for ID") + HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID") if (0 > H5P_peek(plist, H5D_CRT_MIN_DSET_HDR_SIZE_NAME, &prev_set)) - HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, - "can't get extant dset oh minimize flag value") + HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get extant dset oh minimize flag value") if (0 > H5P_poke(plist, H5D_CRT_MIN_DSET_HDR_SIZE_NAME, &minimize)) - HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, - "can't get dset oh minimize flag value") + HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't get dset oh minimize flag value") done: FUNC_LEAVE_API(ret_value) -} /* H5Pset_dset_no_attrs_hint */ +} /* H5Pset_dset_no_attrs_hint() */ diff --git a/src/H5VLnative.c b/src/H5VLnative.c index 5368d41..6469f76 100644 --- a/src/H5VLnative.c +++ b/src/H5VLnative.c @@ -2116,8 +2116,7 @@ H5VL__native_file_optional(void *obj, hid_t H5_ATTR_UNUSED dxpl_id, void H5_ATTR { int minimize = va_arg(arguments, int); /* int to satisfy va_arg */ if (0 > H5F_set_min_dset_ohdr(f, (hbool_t)minimize)) - HGOTO_ERROR(H5E_FILE, H5E_CANTSET, FAIL, - "cannot set file's dataset object header minimization flag") + HGOTO_ERROR(H5E_FILE, H5E_CANTSET, FAIL, "cannot set file's dataset object header minimization flag") break; } |