From 69e501fc70450eec20b5f20a248467347b69547c Mon Sep 17 00:00:00 2001 From: Mohamad Chaarawi Date: Fri, 26 Jul 2013 12:28:26 -0500 Subject: [svn-r23938] remove "switch missing default case" in src. --- src/H5SL.c | 6 ++++++ src/H5Shyper.c | 3 +++ src/H5T.c | 8 ++++++++ src/H5Tdbg.c | 2 ++ src/H5Znbit.c | 12 ++++++++++++ src/H5Zshuffle.c | 6 ++++++ src/H5checksum.c | 2 ++ src/H5system.c | 2 ++ 8 files changed, 41 insertions(+) diff --git a/src/H5SL.c b/src/H5SL.c index 5c46fd4..2e2ad1e 100644 --- a/src/H5SL.c +++ b/src/H5SL.c @@ -1668,6 +1668,9 @@ H5SL_below(H5SL_t *slist, const void *key) case H5SL_TYPE_GENERIC: H5SL_FIND(GENERIC, slist, x, const void, key, -) break; + + default: + HDassert(0 && "Unknown skiplist type!"); } /* end switch */ /* An exact match for 'key' must not have been found in list, if we get here */ @@ -1767,6 +1770,9 @@ H5SL_above(H5SL_t *slist, const void *key) case H5SL_TYPE_GENERIC: H5SL_FIND(GENERIC, slist, x, const void, key, -) break; + + default: + HDassert(0 && "Unknown skiplist type!"); } /* end switch */ /* An exact match for 'key' must not have been found in list, if we get here */ diff --git a/src/H5Shyper.c b/src/H5Shyper.c index d88ac35..f8d87e4 100644 --- a/src/H5Shyper.c +++ b/src/H5Shyper.c @@ -8249,6 +8249,9 @@ loc += fast_dim_buf_off; duffs_index = (fast_dim_count + 7) / 8; switch (fast_dim_count % 8) { + default: + HDassert(0 && "This Should never be executed!"); + break; case 0: do { diff --git a/src/H5T.c b/src/H5T.c index 080af8e..8f44035 100644 --- a/src/H5T.c +++ b/src/H5T.c @@ -3247,6 +3247,8 @@ H5T_copy(H5T_t *old_dt, H5T_copy_t method) new_dt->shared->state = H5T_STATE_RDONLY; } break; + default: + HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, NULL, "invalid copy method type") } /* end switch */ /* Update fields in the new struct, if we aren't sharing an already opened @@ -3449,6 +3451,8 @@ H5T_lock (H5T_t *dt, hbool_t immutable) case H5T_STATE_OPEN: /*void*/ break; + default: + HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "invalid datatype state") } done: @@ -4850,6 +4854,8 @@ H5T_oloc(H5T_t *dt) HDassert(dt->sh_loc.type == H5O_SHARE_TYPE_COMMITTED); ret_value = &dt->oloc; break; + default: + HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, NULL, "invalid datatype state") } /* end switch */ done: @@ -4888,6 +4894,8 @@ H5T_nameof(H5T_t *dt) case H5T_STATE_OPEN: ret_value = &(dt->path); break; + default: + HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, NULL, "invalid datatype state") } /* end switch */ done: diff --git a/src/H5Tdbg.c b/src/H5Tdbg.c index e5df7ff..fe204d8 100644 --- a/src/H5Tdbg.c +++ b/src/H5Tdbg.c @@ -237,6 +237,8 @@ H5T_debug(const H5T_t *dt, FILE *stream) case H5T_STATE_OPEN: s2 = "[named,open]"; break; + default: + HDassert(0 && "This Should never be executed!"); } /* end switch */ fprintf(stream, "%s%s {nbytes=%lu", s1, s2, (unsigned long)(dt->shared->size)); diff --git a/src/H5Znbit.c b/src/H5Znbit.c index 134ef3a..ebb534b 100644 --- a/src/H5Znbit.c +++ b/src/H5Znbit.c @@ -1093,6 +1093,8 @@ H5Z_nbit_decompress_one_array(unsigned char *data, size_t data_offset, parms_index++; /* skip size of no-op type */ H5Z_nbit_decompress_one_nooptype(data, data_offset, buffer, j, buf_len, total_size); break; + default: + HDassert(0 && "This Should never be executed!"); } /* end switch */ } @@ -1131,6 +1133,8 @@ H5Z_nbit_decompress_one_compound(unsigned char *data, size_t data_offset, H5Z_nbit_decompress_one_nooptype(data, data_offset+member_offset, buffer, j, buf_len, size); break; + default: + HDassert(0 && "This Should never be executed!"); } /* end switch */ } } @@ -1179,6 +1183,8 @@ H5Z_nbit_decompress(unsigned char *data, unsigned d_nelmts, unsigned char *buffe parms_index = 4; } break; + default: + HDassert(0 && "This Should never be executed!"); } /* end switch */ } @@ -1320,6 +1326,8 @@ static void H5Z_nbit_compress_one_array(unsigned char *data, size_t data_offset, parms_index++; /* skip size of no-op type */ H5Z_nbit_compress_one_nooptype(data, data_offset, buffer, j, buf_len, total_size); break; + default: + HDassert(0 && "This Should never be executed!"); } /* end switch */ } @@ -1358,6 +1366,8 @@ static void H5Z_nbit_compress_one_compound(unsigned char *data, size_t data_offs H5Z_nbit_compress_one_nooptype(data, data_offset+member_offset, buffer, j, buf_len, size); break; + default: + HDassert(0 && "This Should never be executed!"); } /* end switch */ } } @@ -1406,6 +1416,8 @@ static void H5Z_nbit_compress(unsigned char *data, unsigned d_nelmts, unsigned c parms_index = 4; } break; + default: + HDassert(0 && "This Should never be executed!"); } /* end switch */ /* Update the size to the new value after compression. If there are any bits hanging over in diff --git a/src/H5Zshuffle.c b/src/H5Zshuffle.c index 7aa0202..90509b0 100644 --- a/src/H5Zshuffle.c +++ b/src/H5Zshuffle.c @@ -183,6 +183,9 @@ H5Z_filter_shuffle(unsigned flags, size_t cd_nelmts, const unsigned cd_values[], duffs_index = (numofelements + 7) / 8; switch (numofelements % 8) { + default: + HDassert(0 && "This Should never be executed!"); + break; case 0: do { @@ -238,6 +241,9 @@ H5Z_filter_shuffle(unsigned flags, size_t cd_nelmts, const unsigned cd_values[], duffs_index = (numofelements + 7) / 8; switch (numofelements % 8) { + default: + HDassert(0 && "This Should never be executed!"); + break; case 0: do { diff --git a/src/H5checksum.c b/src/H5checksum.c index ec8b2b0..48e4ce5 100644 --- a/src/H5checksum.c +++ b/src/H5checksum.c @@ -422,6 +422,8 @@ H5_checksum_lookup3(const void *key, size_t length, uint32_t initval) case 1 : a+=k[0]; break; case 0 : goto done; + default: + HDassert(0 && "This Should never be executed!"); } H5_lookup3_final(a, b, c); diff --git a/src/H5system.c b/src/H5system.c index a93a128..e46964f 100644 --- a/src/H5system.c +++ b/src/H5system.c @@ -155,6 +155,8 @@ HDfprintf(FILE *stream, const char *fmt, ...) case '#': prefix = 1; break; + default: + HDassert(0 && "This Should never be executed!"); } /* end switch */ /*lint !e744 Switch statement doesn't _need_ default */ s++; } /* end while */ -- cgit v0.12 From cd7ba8ad55e7432bba2e778b6ffdceb7e8293907 Mon Sep 17 00:00:00 2001 From: Neil Fortner Date: Fri, 26 Jul 2013 17:14:03 -0500 Subject: [svn-r23939] Fix unused variables warnings in trunk Rename static functions in H5Adense.c, H5B2cache.c, H5Bcache.c Switch these functions to use FUNC_ENTER_STATIC* macros Tested: koala --- src/H5Adense.c | 88 +++++++++++++------------- src/H5B2cache.c | 192 ++++++++++++++++++++++++++++---------------------------- src/H5B2hdr.c | 4 +- src/H5B2stat.c | 2 +- src/H5Bcache.c | 64 +++++++++---------- src/H5Dchunk.c | 1 - src/H5FDmulti.c | 2 - src/H5G.c | 7 --- src/H5Gent.c | 2 +- src/H5Pocpl.c | 1 - src/H5dbg.c | 2 +- 11 files changed, 177 insertions(+), 188 deletions(-) diff --git a/src/H5Adense.c b/src/H5Adense.c index 4c10255..0b73a20 100644 --- a/src/H5Adense.c +++ b/src/H5Adense.c @@ -292,7 +292,7 @@ done: /*------------------------------------------------------------------------- - * Function: H5A_dense_fnd_cb + * Function: H5A__dense_fnd_cb * * Purpose: Callback when an attribute is located in an index * @@ -305,11 +305,11 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5A_dense_fnd_cb(const H5A_t *attr, hbool_t *took_ownership, void *_user_attr) +H5A__dense_fnd_cb(const H5A_t *attr, hbool_t *took_ownership, void *_user_attr) { H5A_t const **user_attr = (H5A_t const **)_user_attr; /* User data from v2 B-tree attribute lookup */ - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_STATIC_NOERR /* * Check arguments. @@ -322,7 +322,7 @@ H5A_dense_fnd_cb(const H5A_t *attr, hbool_t *took_ownership, void *_user_attr) *took_ownership = TRUE; FUNC_LEAVE_NOAPI(SUCCEED) -} /* end H5A_dense_fnd_cb() */ +} /* end H5A__dense_fnd_cb() */ /*------------------------------------------------------------------------- @@ -395,7 +395,7 @@ H5A_dense_open(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, const char *na udata.name_hash = H5_checksum_lookup3(name, HDstrlen(name), 0); udata.flags = 0; udata.corder = 0; - udata.found_op = H5A_dense_fnd_cb; /* v2 B-tree comparison callback */ + udata.found_op = H5A__dense_fnd_cb; /* v2 B-tree comparison callback */ udata.found_op_data = &ret_value; /* Find & copy the attribute in the 'name' index */ @@ -578,7 +578,7 @@ done: /*------------------------------------------------------------------------- - * Function: H5A_dense_write_bt2_cb2 + * Function: H5A__dense_write_bt2_cb2 * * Purpose: v2 B-tree 'modify' callback to update the record for a creation * order index @@ -592,12 +592,12 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5A_dense_write_bt2_cb2(void *_record, void *_op_data, hbool_t *changed) +H5A__dense_write_bt2_cb2(void *_record, void *_op_data, hbool_t *changed) { H5A_dense_bt2_corder_rec_t *record = (H5A_dense_bt2_corder_rec_t *)_record; /* Record from B-tree */ H5O_fheap_id_t *new_heap_id = (H5O_fheap_id_t *)_op_data; /* "op data" from v2 B-tree modify */ - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_STATIC_NOERR /* * Check arguments. @@ -612,11 +612,11 @@ H5A_dense_write_bt2_cb2(void *_record, void *_op_data, hbool_t *changed) *changed = TRUE; FUNC_LEAVE_NOAPI(SUCCEED) -} /* end H5A_dense_write_bt2_cb2() */ +} /* end H5A__dense_write_bt2_cb2() */ /*------------------------------------------------------------------------- - * Function: H5A_dense_write_bt2_cb + * Function: H5A__dense_write_bt2_cb * * Purpose: v2 B-tree 'modify' callback to update the data for an attribute * @@ -629,7 +629,7 @@ H5A_dense_write_bt2_cb2(void *_record, void *_op_data, hbool_t *changed) *------------------------------------------------------------------------- */ static herr_t -H5A_dense_write_bt2_cb(void *_record, void *_op_data, hbool_t *changed) +H5A__dense_write_bt2_cb(void *_record, void *_op_data, hbool_t *changed) { H5A_dense_bt2_name_rec_t *record = (H5A_dense_bt2_name_rec_t *)_record; /* Record from B-tree */ H5A_bt2_od_wrt_t *op_data = (H5A_bt2_od_wrt_t *)_op_data; /* "op data" from v2 B-tree modify */ @@ -638,7 +638,7 @@ H5A_dense_write_bt2_cb(void *_record, void *_op_data, hbool_t *changed) uint8_t attr_buf[H5A_ATTR_BUF_SIZE]; /* Buffer for serializing attribute */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_STATIC /* * Check arguments. @@ -676,7 +676,7 @@ H5A_dense_write_bt2_cb(void *_record, void *_op_data, hbool_t *changed) udata.found_op_data = NULL; /* Modify record for creation order index */ - if(H5B2_modify(bt2_corder, op_data->dxpl_id, &udata, H5A_dense_write_bt2_cb2, &op_data->attr->sh_loc.u.heap_id) < 0) + if(H5B2_modify(bt2_corder, op_data->dxpl_id, &udata, H5A__dense_write_bt2_cb2, &op_data->attr->sh_loc.u.heap_id) < 0) HGOTO_ERROR(H5E_ATTR, H5E_CANTINSERT, FAIL, "unable to modify record in v2 B-tree") } /* end if */ @@ -727,7 +727,7 @@ done: HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close wrapped buffer") FUNC_LEAVE_NOAPI(ret_value) -} /* end H5A_dense_write_bt2_cb() */ +} /* end H5A__dense_write_bt2_cb() */ /*------------------------------------------------------------------------- @@ -814,7 +814,7 @@ H5A_dense_write(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, H5A_t *attr) op_data.corder_bt2_addr = ainfo->corder_bt2_addr; /* Modify attribute through 'name' tracking v2 B-tree */ - if(H5B2_modify(bt2_name, dxpl_id, &udata, H5A_dense_write_bt2_cb, &op_data) < 0) + if(H5B2_modify(bt2_name, dxpl_id, &udata, H5A__dense_write_bt2_cb, &op_data) < 0) HGOTO_ERROR(H5E_ATTR, H5E_CANTINSERT, FAIL, "unable to modify record in v2 B-tree") done: @@ -831,7 +831,7 @@ done: /*------------------------------------------------------------------------- - * Function: H5A_dense_copy_fh_cb + * Function: H5A__dense_copy_fh_cb * * Purpose: Callback for fractal heap operator, to make copy of attribute * for calling routine @@ -845,12 +845,12 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5A_dense_copy_fh_cb(const void *obj, size_t UNUSED obj_len, void *_udata) +H5A__dense_copy_fh_cb(const void *obj, size_t UNUSED obj_len, void *_udata) { H5A_fh_ud_cp_t *udata = (H5A_fh_ud_cp_t *)_udata; /* User data for fractal heap 'op' callback */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_STATIC /* Decode attribute information & keep a copy */ /* (we make a copy instead of calling the user/library callback directly in @@ -871,7 +871,7 @@ H5A_dense_copy_fh_cb(const void *obj, size_t UNUSED obj_len, void *_udata) done: FUNC_LEAVE_NOAPI(ret_value) -} /* end H5A_dense_copy_fh_cb() */ +} /* end H5A__dense_copy_fh_cb() */ /*------------------------------------------------------------------------- @@ -948,7 +948,7 @@ H5A_dense_rename(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, const char * udata.name_hash = H5_checksum_lookup3(old_name, HDstrlen(old_name), 0); udata.flags = 0; udata.corder = 0; - udata.found_op = H5A_dense_fnd_cb; /* v2 B-tree comparison callback */ + udata.found_op = H5A__dense_fnd_cb; /* v2 B-tree comparison callback */ udata.found_op_data = &attr_copy; /* Get copy of attribute through 'name' tracking v2 B-tree */ @@ -1030,7 +1030,7 @@ done: /*------------------------------------------------------------------------- - * Function: H5A_dense_iterate_bt2_cb + * Function: H5A__dense_iterate_bt2_cb * * Purpose: v2 B-tree callback for dense attribute storage iterator * @@ -1043,13 +1043,13 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5A_dense_iterate_bt2_cb(const void *_record, void *_bt2_udata) +H5A__dense_iterate_bt2_cb(const void *_record, void *_bt2_udata) { const H5A_dense_bt2_name_rec_t *record = (const H5A_dense_bt2_name_rec_t *)_record; /* Record from B-tree */ H5A_bt2_ud_it_t *bt2_udata = (H5A_bt2_ud_it_t *)_bt2_udata; /* User data for callback */ herr_t ret_value = H5_ITER_CONT; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_STATIC /* Check for skipping attributes */ if(bt2_udata->skip > 0) @@ -1072,7 +1072,7 @@ H5A_dense_iterate_bt2_cb(const void *_record, void *_bt2_udata) fh_udata.attr = NULL; /* Call fractal heap 'op' routine, to copy the attribute information */ - if(H5HF_op(fheap, bt2_udata->dxpl_id, &record->id, H5A_dense_copy_fh_cb, &fh_udata) < 0) + if(H5HF_op(fheap, bt2_udata->dxpl_id, &record->id, H5A__dense_copy_fh_cb, &fh_udata) < 0) HGOTO_ERROR(H5E_ATTR, H5E_CANTOPERATE, H5_ITER_ERROR, "heap op callback failed") /* Check which type of callback to make */ @@ -1123,7 +1123,7 @@ H5A_dense_iterate_bt2_cb(const void *_record, void *_bt2_udata) done: FUNC_LEAVE_NOAPI(ret_value) -} /* end H5A_dense_iterate_bt2_cb() */ +} /* end H5A__dense_iterate_bt2_cb() */ /*------------------------------------------------------------------------- @@ -1231,7 +1231,7 @@ H5A_dense_iterate(H5F_t *f, hid_t dxpl_id, hid_t loc_id, const H5O_ainfo_t *ainf /* Iterate over the records in the v2 B-tree's "native" order */ /* (by hash of name) */ - if((ret_value = H5B2_iterate(bt2, dxpl_id, H5A_dense_iterate_bt2_cb, &udata)) < 0) + if((ret_value = H5B2_iterate(bt2, dxpl_id, H5A__dense_iterate_bt2_cb, &udata)) < 0) HERROR(H5E_ATTR, H5E_BADITER, "attribute iteration failed"); /* Update the last attribute examined, if requested */ @@ -1265,7 +1265,7 @@ done: /*------------------------------------------------------------------------- - * Function: H5A_dense_remove_bt2_cb + * Function: H5A__dense_remove_bt2_cb * * Purpose: v2 B-tree callback for dense attribute storage record removal * @@ -1278,7 +1278,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5A_dense_remove_bt2_cb(const void *_record, void *_udata) +H5A__dense_remove_bt2_cb(const void *_record, void *_udata) { const H5A_dense_bt2_name_rec_t *record = (const H5A_dense_bt2_name_rec_t *)_record; H5A_bt2_ud_rm_t *udata = (H5A_bt2_ud_rm_t *)_udata; /* User data for callback */ @@ -1286,7 +1286,7 @@ H5A_dense_remove_bt2_cb(const void *_record, void *_udata) H5B2_t *bt2_corder = NULL; /* v2 B-tree handle for creation order index */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_STATIC /* Check for removing the link from the creation order index */ if(H5F_addr_defined(udata->corder_bt2_addr)) { @@ -1325,7 +1325,7 @@ done: HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close v2 B-tree for creation order index") FUNC_LEAVE_NOAPI(ret_value) -} /* end H5A_dense_remove_bt2_cb() */ +} /* end H5A__dense_remove_bt2_cb() */ /*------------------------------------------------------------------------- @@ -1396,12 +1396,12 @@ H5A_dense_remove(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, const char * udata.common.shared_fheap = shared_fheap; udata.common.name = name; udata.common.name_hash = H5_checksum_lookup3(name, HDstrlen(name), 0); - udata.common.found_op = H5A_dense_fnd_cb; /* v2 B-tree comparison callback */ + udata.common.found_op = H5A__dense_fnd_cb; /* v2 B-tree comparison callback */ udata.common.found_op_data = &attr_copy; udata.corder_bt2_addr = ainfo->corder_bt2_addr; /* Remove the record from the name index v2 B-tree */ - if(H5B2_remove(bt2_name, dxpl_id, &udata, H5A_dense_remove_bt2_cb, &udata) < 0) + if(H5B2_remove(bt2_name, dxpl_id, &udata, H5A__dense_remove_bt2_cb, &udata) < 0) HGOTO_ERROR(H5E_ATTR, H5E_CANTREMOVE, FAIL, "unable to remove attribute from name index v2 B-tree") done: @@ -1420,7 +1420,7 @@ done: /*------------------------------------------------------------------------- - * Function: H5A_dense_remove_by_idx_bt2_cb + * Function: H5A__dense_remove_by_idx_bt2_cb * * Purpose: v2 B-tree callback for dense attribute storage record removal by index * @@ -1433,7 +1433,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5A_dense_remove_by_idx_bt2_cb(const void *_record, void *_bt2_udata) +H5A__dense_remove_by_idx_bt2_cb(const void *_record, void *_bt2_udata) { H5HF_t *fheap; /* Fractal heap handle */ H5B2_t *bt2 = NULL; /* v2 B-tree handle for index */ @@ -1444,7 +1444,7 @@ H5A_dense_remove_by_idx_bt2_cb(const void *_record, void *_bt2_udata) hbool_t use_sh_loc; /* Whether to use the attribute's shared location or the separate one */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_STATIC /* Set up the user data for fractal heap 'op' callback */ fh_udata.f = bt2_udata->f; @@ -1461,7 +1461,7 @@ H5A_dense_remove_by_idx_bt2_cb(const void *_record, void *_bt2_udata) /* Check whether to make a copy of the attribute or just need the shared location info */ if(H5F_addr_defined(bt2_udata->other_bt2_addr) || !(record->flags & H5O_MSG_FLAG_SHARED)) { /* Call fractal heap 'op' routine, to make copy of attribute to remove */ - if(H5HF_op(fheap, bt2_udata->dxpl_id, &record->id, H5A_dense_copy_fh_cb, &fh_udata) < 0) + if(H5HF_op(fheap, bt2_udata->dxpl_id, &record->id, H5A__dense_copy_fh_cb, &fh_udata) < 0) HGOTO_ERROR(H5E_ATTR, H5E_CANTOPERATE, FAIL, "attribute removal callback failed") HDassert(fh_udata.attr); @@ -1543,7 +1543,7 @@ done: H5O_msg_free(H5O_ATTR_ID, fh_udata.attr); FUNC_LEAVE_NOAPI(ret_value) -} /* end H5A_dense_remove_by_idx_bt2_cb() */ +} /* end H5A__dense_remove_by_idx_bt2_cb() */ /*------------------------------------------------------------------------- @@ -1644,7 +1644,7 @@ H5A_dense_remove_by_idx(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, udata.other_bt2_addr = idx_type == H5_INDEX_NAME ? ainfo->corder_bt2_addr : ainfo->name_bt2_addr; /* Remove the record from the name index v2 B-tree */ - if(H5B2_remove_by_idx(bt2, dxpl_id, order, n, H5A_dense_remove_by_idx_bt2_cb, &udata) < 0) + if(H5B2_remove_by_idx(bt2, dxpl_id, order, n, H5A__dense_remove_by_idx_bt2_cb, &udata) < 0) HGOTO_ERROR(H5E_ATTR, H5E_CANTREMOVE, FAIL, "unable to remove attribute from v2 B-tree index") } /* end if */ else { @@ -1768,7 +1768,7 @@ done: /*------------------------------------------------------------------------- - * Function: H5A_dense_delete_bt2_cb + * Function: H5A__dense_delete_bt2_cb * * Purpose: v2 B-tree callback for dense attribute storage deletion * @@ -1781,14 +1781,14 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5A_dense_delete_bt2_cb(const void *_record, void *_bt2_udata) +H5A__dense_delete_bt2_cb(const void *_record, void *_bt2_udata) { const H5A_dense_bt2_name_rec_t *record = (const H5A_dense_bt2_name_rec_t *)_record; /* Record from B-tree */ H5A_bt2_ud_common_t *bt2_udata = (H5A_bt2_ud_common_t *)_bt2_udata; /* User data for callback */ H5A_t *attr = NULL; /* Attribute being removed */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_STATIC /* Check for shared attribute */ if(record->flags & H5O_MSG_FLAG_SHARED) { @@ -1813,7 +1813,7 @@ H5A_dense_delete_bt2_cb(const void *_record, void *_bt2_udata) fh_udata.attr = NULL; /* Call fractal heap 'op' routine, to copy the attribute information */ - if(H5HF_op(bt2_udata->fheap, bt2_udata->dxpl_id, &record->id, H5A_dense_copy_fh_cb, &fh_udata) < 0) + if(H5HF_op(bt2_udata->fheap, bt2_udata->dxpl_id, &record->id, H5A__dense_copy_fh_cb, &fh_udata) < 0) HGOTO_ERROR(H5E_ATTR, H5E_CANTOPERATE, FAIL, "heap op callback failed") attr = fh_udata.attr; @@ -1829,7 +1829,7 @@ done: H5O_msg_free_real(H5O_MSG_ATTR, attr); FUNC_LEAVE_NOAPI(ret_value) -} /* end H5A_dense_delete_bt2_cb() */ +} /* end H5A__dense_delete_bt2_cb() */ /*------------------------------------------------------------------------- @@ -1876,7 +1876,7 @@ H5A_dense_delete(H5F_t *f, hid_t dxpl_id, H5O_ainfo_t *ainfo) udata.found_op_data = NULL; /* Delete name index v2 B-tree */ - if(H5B2_delete(f, dxpl_id, ainfo->name_bt2_addr, NULL, H5A_dense_delete_bt2_cb, &udata) < 0) + if(H5B2_delete(f, dxpl_id, ainfo->name_bt2_addr, NULL, H5A__dense_delete_bt2_cb, &udata) < 0) HGOTO_ERROR(H5E_ATTR, H5E_CANTDELETE, FAIL, "unable to delete v2 B-tree for name index") ainfo->name_bt2_addr = HADDR_UNDEF; diff --git a/src/H5B2cache.c b/src/H5B2cache.c index 2ee4ef7..a48d3a8 100644 --- a/src/H5B2cache.c +++ b/src/H5B2cache.c @@ -69,21 +69,21 @@ /********************/ /* Metadata cache callbacks */ -static H5B2_hdr_t *H5B2_cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata); -static herr_t H5B2_cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5B2_hdr_t *hdr, unsigned UNUSED * flags_ptr); -static herr_t H5B2_cache_hdr_dest(H5F_t *f, H5B2_hdr_t *hdr); -static herr_t H5B2_cache_hdr_clear(H5F_t *f, H5B2_hdr_t *hdr, hbool_t destroy); -static herr_t H5B2_cache_hdr_size(const H5F_t *f, const H5B2_hdr_t *hdr, size_t *size_ptr); -static H5B2_internal_t *H5B2_cache_internal_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata); -static herr_t H5B2_cache_internal_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5B2_internal_t *i, unsigned UNUSED * flags_ptr); -static herr_t H5B2_cache_internal_dest(H5F_t *f, H5B2_internal_t *internal); -static herr_t H5B2_cache_internal_clear(H5F_t *f, H5B2_internal_t *i, hbool_t destroy); -static herr_t H5B2_cache_internal_size(const H5F_t *f, const H5B2_internal_t *i, size_t *size_ptr); -static H5B2_leaf_t *H5B2_cache_leaf_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata); -static herr_t H5B2_cache_leaf_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5B2_leaf_t *l, unsigned UNUSED * flags_ptr); -static herr_t H5B2_cache_leaf_dest(H5F_t *f, H5B2_leaf_t *leaf); -static herr_t H5B2_cache_leaf_clear(H5F_t *f, H5B2_leaf_t *l, hbool_t destroy); -static herr_t H5B2_cache_leaf_size(const H5F_t *f, const H5B2_leaf_t *l, size_t *size_ptr); +static H5B2_hdr_t *H5B2__cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata); +static herr_t H5B2__cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5B2_hdr_t *hdr, unsigned UNUSED * flags_ptr); +static herr_t H5B2__cache_hdr_dest(H5F_t *f, H5B2_hdr_t *hdr); +static herr_t H5B2__cache_hdr_clear(H5F_t *f, H5B2_hdr_t *hdr, hbool_t destroy); +static herr_t H5B2__cache_hdr_size(const H5F_t *f, const H5B2_hdr_t *hdr, size_t *size_ptr); +static H5B2_internal_t *H5B2__cache_internal_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata); +static herr_t H5B2__cache_internal_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5B2_internal_t *i, unsigned UNUSED * flags_ptr); +static herr_t H5B2__cache_internal_dest(H5F_t *f, H5B2_internal_t *internal); +static herr_t H5B2__cache_internal_clear(H5F_t *f, H5B2_internal_t *i, hbool_t destroy); +static herr_t H5B2__cache_internal_size(const H5F_t *f, const H5B2_internal_t *i, size_t *size_ptr); +static H5B2_leaf_t *H5B2__cache_leaf_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata); +static herr_t H5B2__cache_leaf_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5B2_leaf_t *l, unsigned UNUSED * flags_ptr); +static herr_t H5B2__cache_leaf_dest(H5F_t *f, H5B2_leaf_t *leaf); +static herr_t H5B2__cache_leaf_clear(H5F_t *f, H5B2_leaf_t *l, hbool_t destroy); +static herr_t H5B2__cache_leaf_size(const H5F_t *f, const H5B2_leaf_t *l, size_t *size_ptr); /*********************/ @@ -93,34 +93,34 @@ static herr_t H5B2_cache_leaf_size(const H5F_t *f, const H5B2_leaf_t *l, size_t /* H5B2 inherits cache-like properties from H5AC */ const H5AC_class_t H5AC_BT2_HDR[1] = {{ H5AC_BT2_HDR_ID, - (H5AC_load_func_t)H5B2_cache_hdr_load, - (H5AC_flush_func_t)H5B2_cache_hdr_flush, - (H5AC_dest_func_t)H5B2_cache_hdr_dest, - (H5AC_clear_func_t)H5B2_cache_hdr_clear, + (H5AC_load_func_t)H5B2__cache_hdr_load, + (H5AC_flush_func_t)H5B2__cache_hdr_flush, + (H5AC_dest_func_t)H5B2__cache_hdr_dest, + (H5AC_clear_func_t)H5B2__cache_hdr_clear, (H5AC_notify_func_t)NULL, - (H5AC_size_func_t)H5B2_cache_hdr_size, + (H5AC_size_func_t)H5B2__cache_hdr_size, }}; /* H5B2 inherits cache-like properties from H5AC */ const H5AC_class_t H5AC_BT2_INT[1] = {{ H5AC_BT2_INT_ID, - (H5AC_load_func_t)H5B2_cache_internal_load, - (H5AC_flush_func_t)H5B2_cache_internal_flush, - (H5AC_dest_func_t)H5B2_cache_internal_dest, - (H5AC_clear_func_t)H5B2_cache_internal_clear, + (H5AC_load_func_t)H5B2__cache_internal_load, + (H5AC_flush_func_t)H5B2__cache_internal_flush, + (H5AC_dest_func_t)H5B2__cache_internal_dest, + (H5AC_clear_func_t)H5B2__cache_internal_clear, (H5AC_notify_func_t)NULL, - (H5AC_size_func_t)H5B2_cache_internal_size, + (H5AC_size_func_t)H5B2__cache_internal_size, }}; /* H5B2 inherits cache-like properties from H5AC */ const H5AC_class_t H5AC_BT2_LEAF[1] = {{ H5AC_BT2_LEAF_ID, - (H5AC_load_func_t)H5B2_cache_leaf_load, - (H5AC_flush_func_t)H5B2_cache_leaf_flush, - (H5AC_dest_func_t)H5B2_cache_leaf_dest, - (H5AC_clear_func_t)H5B2_cache_leaf_clear, + (H5AC_load_func_t)H5B2__cache_leaf_load, + (H5AC_flush_func_t)H5B2__cache_leaf_flush, + (H5AC_dest_func_t)H5B2__cache_leaf_dest, + (H5AC_clear_func_t)H5B2__cache_leaf_clear, (H5AC_notify_func_t)NULL, - (H5AC_size_func_t)H5B2_cache_leaf_size, + (H5AC_size_func_t)H5B2__cache_leaf_size, }}; @@ -136,7 +136,7 @@ const H5AC_class_t H5AC_BT2_LEAF[1] = {{ /*------------------------------------------------------------------------- - * Function: H5B2_cache_hdr_load + * Function: H5B2__cache_hdr_load * * Purpose: Loads a B-tree header from the disk. * @@ -150,7 +150,7 @@ const H5AC_class_t H5AC_BT2_LEAF[1] = {{ *------------------------------------------------------------------------- */ static H5B2_hdr_t * -H5B2_cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata) +H5B2__cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata) { H5B2_hdr_t *hdr = NULL; /* B-tree header */ H5B2_hdr_cache_ud_t *udata = (H5B2_hdr_cache_ud_t *)_udata; @@ -165,7 +165,7 @@ H5B2_cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata) const uint8_t *p; /* Pointer into raw data buffer */ H5B2_hdr_t *ret_value; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_STATIC /* Check arguments */ HDassert(f); @@ -256,11 +256,11 @@ done: HDONE_ERROR(H5E_BTREE, H5E_CANTRELEASE, NULL, "can't release v2 B-tree header") FUNC_LEAVE_NOAPI(ret_value) -} /* end H5B2_cache_hdr_load() */ /*lint !e818 Can't make udata a pointer to const */ +} /* end H5B2__cache_hdr_load() */ /*lint !e818 Can't make udata a pointer to const */ /*------------------------------------------------------------------------- - * Function: H5B2_cache_hdr_flush + * Function: H5B2__cache_hdr_flush * * Purpose: Flushes a dirty B-tree header to disk. * @@ -273,14 +273,14 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5B2_cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, +H5B2__cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5B2_hdr_t *hdr, unsigned UNUSED * flags_ptr) { H5WB_t *wb = NULL; /* Wrapped buffer for header data */ uint8_t hdr_buf[H5B2_HDR_BUF_SIZE]; /* Buffer for header */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_STATIC /* check arguments */ HDassert(f); @@ -351,7 +351,7 @@ H5B2_cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, } /* end if */ if(destroy) - if(H5B2_cache_hdr_dest(f, hdr) < 0) + if(H5B2__cache_hdr_dest(f, hdr) < 0) HGOTO_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to destroy B-tree header") done: @@ -360,11 +360,11 @@ done: HDONE_ERROR(H5E_BTREE, H5E_CLOSEERROR, FAIL, "can't close wrapped buffer") FUNC_LEAVE_NOAPI(ret_value) -} /* H5B2_cache_hdr_flush() */ +} /* H5B2__cache_hdr_flush() */ /*------------------------------------------------------------------------- - * Function: H5B2_cache_hdr_dest + * Function: H5B2__cache_hdr_dest * * Purpose: Destroys a B-tree header in memory. * @@ -377,11 +377,11 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5B2_cache_hdr_dest(H5F_t *f, H5B2_hdr_t *hdr) +H5B2__cache_hdr_dest(H5F_t *f, H5B2_hdr_t *hdr) { herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_STATIC /* Check arguments */ HDassert(hdr); @@ -404,11 +404,11 @@ H5B2_cache_hdr_dest(H5F_t *f, H5B2_hdr_t *hdr) done: FUNC_LEAVE_NOAPI(ret_value) -} /* end H5B2_cache_hdr_dest() */ +} /* end H5B2__cache_hdr_dest() */ /*------------------------------------------------------------------------- - * Function: H5B2_cache_hdr_clear + * Function: H5B2__cache_hdr_clear * * Purpose: Mark a B-tree header in memory as non-dirty. * @@ -421,11 +421,11 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5B2_cache_hdr_clear(H5F_t *f, H5B2_hdr_t *hdr, hbool_t destroy) +H5B2__cache_hdr_clear(H5F_t *f, H5B2_hdr_t *hdr, hbool_t destroy) { herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_STATIC /* * Check arguments. @@ -436,16 +436,16 @@ H5B2_cache_hdr_clear(H5F_t *f, H5B2_hdr_t *hdr, hbool_t destroy) hdr->cache_info.is_dirty = FALSE; if(destroy) - if(H5B2_cache_hdr_dest(f, hdr) < 0) + if(H5B2__cache_hdr_dest(f, hdr) < 0) HGOTO_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to destroy B-tree header") done: FUNC_LEAVE_NOAPI(ret_value) -} /* end H5B2_cache_hdr_clear() */ +} /* end H5B2__cache_hdr_clear() */ /*------------------------------------------------------------------------- - * Function: H5B2_cache_hdr_size + * Function: H5B2__cache_hdr_size * * Purpose: Compute the size in bytes of a B-tree header * on disk, and return it in *size_ptr. On failure, @@ -460,9 +460,9 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5B2_cache_hdr_size(const H5F_t UNUSED *f, const H5B2_hdr_t *hdr, size_t *size_ptr) +H5B2__cache_hdr_size(const H5F_t UNUSED *f, const H5B2_hdr_t *hdr, size_t *size_ptr) { - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_STATIC_NOERR /* check arguments */ HDassert(f); @@ -472,11 +472,11 @@ H5B2_cache_hdr_size(const H5F_t UNUSED *f, const H5B2_hdr_t *hdr, size_t *size_p *size_ptr = hdr->hdr_size; FUNC_LEAVE_NOAPI(SUCCEED) -} /* H5B2_cache_hdr_size() */ +} /* H5B2__cache_hdr_size() */ /*------------------------------------------------------------------------- - * Function: H5B2_cache_internal_load + * Function: H5B2__cache_internal_load * * Purpose: Loads a B-tree internal node from the disk. * @@ -490,7 +490,7 @@ H5B2_cache_hdr_size(const H5F_t UNUSED *f, const H5B2_hdr_t *hdr, size_t *size_p *------------------------------------------------------------------------- */ static H5B2_internal_t * -H5B2_cache_internal_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata) +H5B2__cache_internal_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata) { H5B2_internal_cache_ud_t *udata = (H5B2_internal_cache_ud_t *)_udata; /* Pointer to user data */ H5B2_internal_t *internal = NULL; /* Internal node read */ @@ -502,7 +502,7 @@ H5B2_cache_internal_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata) unsigned u; /* Local index variable */ H5B2_internal_t *ret_value; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_STATIC /* Check arguments */ HDassert(f); @@ -604,11 +604,11 @@ done: HDONE_ERROR(H5E_BTREE, H5E_CANTFREE, NULL, "unable to destroy B-tree internal node") FUNC_LEAVE_NOAPI(ret_value) -} /* H5B2_cache_internal_load() */ /*lint !e818 Can't make udata a pointer to const */ +} /* H5B2__cache_internal_load() */ /*lint !e818 Can't make udata a pointer to const */ /*------------------------------------------------------------------------- - * Function: H5B2_cache_internal_flush + * Function: H5B2__cache_internal_flush * * Purpose: Flushes a dirty B-tree internal node to disk. * @@ -621,11 +621,11 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5B2_cache_internal_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5B2_internal_t *internal, unsigned UNUSED * flags_ptr) +H5B2__cache_internal_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5B2_internal_t *internal, unsigned UNUSED * flags_ptr) { herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_STATIC /* check arguments */ HDassert(f); @@ -696,16 +696,16 @@ H5B2_cache_internal_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr } /* end if */ if(destroy) - if(H5B2_cache_internal_dest(f, internal) < 0) + if(H5B2__cache_internal_dest(f, internal) < 0) HGOTO_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to destroy B-tree internal node") done: FUNC_LEAVE_NOAPI(ret_value) -} /* H5B2_cache_internal_flush() */ +} /* H5B2__cache_internal_flush() */ /*------------------------------------------------------------------------- - * Function: H5B2_cache_internal_dest + * Function: H5B2__cache_internal_dest * * Purpose: Destroys a B-tree internal node in memory. * @@ -718,11 +718,11 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5B2_cache_internal_dest(H5F_t *f, H5B2_internal_t *internal) +H5B2__cache_internal_dest(H5F_t *f, H5B2_internal_t *internal) { herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_STATIC /* Check arguments */ HDassert(f); @@ -746,11 +746,11 @@ H5B2_cache_internal_dest(H5F_t *f, H5B2_internal_t *internal) done: FUNC_LEAVE_NOAPI(ret_value) -} /* end H5B2_cache_internal_dest() */ +} /* end H5B2__cache_internal_dest() */ /*------------------------------------------------------------------------- - * Function: H5B2_cache_internal_clear + * Function: H5B2__cache_internal_clear * * Purpose: Mark a B-tree internal node in memory as non-dirty. * @@ -763,11 +763,11 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5B2_cache_internal_clear(H5F_t *f, H5B2_internal_t *internal, hbool_t destroy) +H5B2__cache_internal_clear(H5F_t *f, H5B2_internal_t *internal, hbool_t destroy) { herr_t ret_value = SUCCEED; - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_STATIC /* * Check arguments. @@ -778,16 +778,16 @@ H5B2_cache_internal_clear(H5F_t *f, H5B2_internal_t *internal, hbool_t destroy) internal->cache_info.is_dirty = FALSE; if(destroy) - if(H5B2_cache_internal_dest(f, internal) < 0) + if(H5B2__cache_internal_dest(f, internal) < 0) HGOTO_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to destroy B-tree internal node") done: FUNC_LEAVE_NOAPI(ret_value) -} /* end H5B2_cache_internal_clear() */ +} /* end H5B2__cache_internal_clear() */ /*------------------------------------------------------------------------- - * Function: H5B2_cache_internal_size + * Function: H5B2__cache_internal_size * * Purpose: Compute the size in bytes of a B-tree internal node * on disk, and return it in *size_ptr. On failure, @@ -802,9 +802,9 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5B2_cache_internal_size(const H5F_t UNUSED *f, const H5B2_internal_t *internal, size_t *size_ptr) +H5B2__cache_internal_size(const H5F_t UNUSED *f, const H5B2_internal_t *internal, size_t *size_ptr) { - FUNC_ENTER_NOAPI_NOINIT_NOERR + FUNC_ENTER_STATIC_NOERR /* check arguments */ HDassert(internal); @@ -815,11 +815,11 @@ H5B2_cache_internal_size(const H5F_t UNUSED *f, const H5B2_internal_t *internal, *size_ptr = internal->hdr->node_size; FUNC_LEAVE_NOAPI(SUCCEED) -} /* H5B2_cache_internal_size() */ +} /* H5B2__cache_internal_size() */ /*------------------------------------------------------------------------- - * Function: H5B2_cache_leaf_load + * Function: H5B2__cache_leaf_load * * Purpose: Loads a B-tree leaf from the disk. * @@ -833,7 +833,7 @@ H5B2_cache_internal_size(const H5F_t UNUSED *f, const H5B2_internal_t *internal, *------------------------------------------------------------------------- */ static H5B2_leaf_t * -H5B2_cache_leaf_load(H5F_t UNUSED *f, hid_t dxpl_id, haddr_t addr, void *_udata) +H5B2__cache_leaf_load(H5F_t UNUSED *f, hid_t dxpl_id, haddr_t addr, void *_udata) { H5B2_leaf_cache_ud_t *udata = (H5B2_leaf_cache_ud_t *)_udata; H5B2_leaf_t *leaf = NULL; /* Pointer to lead node loaded */ @@ -844,7 +844,7 @@ H5B2_cache_leaf_load(H5F_t UNUSED *f, hid_t dxpl_id, haddr_t addr, void *_udata) unsigned u; /* Local index variable */ H5B2_leaf_t *ret_value; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_STATIC /* Check arguments */ HDassert(f); @@ -926,11 +926,11 @@ done: HDONE_ERROR(H5E_BTREE, H5E_CANTFREE, NULL, "unable to destroy B-tree leaf node") FUNC_LEAVE_NOAPI(ret_value) -} /* H5B2_cache_leaf_load() */ /*lint !e818 Can't make udata a pointer to const */ +} /* H5B2__cache_leaf_load() */ /*lint !e818 Can't make udata a pointer to const */ /*------------------------------------------------------------------------- - * Function: H5B2_cache_leaf_flush + * Function: H5B2__cache_leaf_flush * * Purpose: Flushes a dirty B-tree leaf node to disk. * @@ -943,11 +943,11 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5B2_cache_leaf_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5B2_leaf_t *leaf, unsigned UNUSED * flags_ptr) +H5B2__cache_leaf_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5B2_leaf_t *leaf, unsigned UNUSED * flags_ptr) { herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_STATIC /* check arguments */ HDassert(f); @@ -1004,16 +1004,16 @@ H5B2_cache_leaf_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5 } /* end if */ if(destroy) - if(H5B2_cache_leaf_dest(f, leaf) < 0) + if(H5B2__cache_leaf_dest(f, leaf) < 0) HGOTO_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to destroy B-tree leaf node") done: FUNC_LEAVE_NOAPI(ret_value) -} /* H5B2_cache_leaf_flush() */ +} /* H5B2__cache_leaf_flush() */ /*------------------------------------------------------------------------- - * Function: H5B2_cache_leaf_dest + * Function: H5B2__cache_leaf_dest * * Purpose: Destroys a B-tree leaf node in memory. * @@ -1026,11 +1026,11 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5B2_cache_leaf_dest(H5F_t *f, H5B2_leaf_t *leaf) +H5B2__cache_leaf_dest(H5F_t *f, H5B2_leaf_t *leaf) { herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_STATIC /* Check arguments */ HDassert(f); @@ -1054,11 +1054,11 @@ H5B2_cache_leaf_dest(H5F_t *f, H5B2_leaf_t *leaf) done: FUNC_LEAVE_NOAPI(ret_value) -} /* end H5B2_cache_leaf_dest() */ +} /* end H5B2__cache_leaf_dest() */ /*------------------------------------------------------------------------- - * Function: H5B2_cache_leaf_clear + * Function: H5B2__cache_leaf_clear * * Purpose: Mark a B-tree leaf node in memory as non-dirty. * @@ -1071,11 +1071,11 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5B2_cache_leaf_clear(H5F_t *f, H5B2_leaf_t *leaf, hbool_t destroy) +H5B2__cache_leaf_clear(H5F_t *f, H5B2_leaf_t *leaf, hbool_t destroy) { herr_t ret_value = SUCCEED; - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_STATIC /* * Check arguments. @@ -1086,16 +1086,16 @@ H5B2_cache_leaf_clear(H5F_t *f, H5B2_leaf_t *leaf, hbool_t destroy) leaf->cache_info.is_dirty = FALSE; if(destroy) - if(H5B2_cache_leaf_dest(f, leaf) < 0) + if(H5B2__cache_leaf_dest(f, leaf) < 0) HGOTO_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to destroy B-tree leaf node") done: FUNC_LEAVE_NOAPI(ret_value) -} /* end H5B2_cache_leaf_clear() */ +} /* end H5B2__cache_leaf_clear() */ /*------------------------------------------------------------------------- - * Function: H5B2_cache_leaf_size + * Function: H5B2__cache_leaf_size * * Purpose: Compute the size in bytes of a B-tree leaf node * on disk, and return it in *size_ptr. On failure, @@ -1110,9 +1110,9 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5B2_cache_leaf_size(const H5F_t UNUSED *f, const H5B2_leaf_t *leaf, size_t *size_ptr) +H5B2__cache_leaf_size(const H5F_t UNUSED *f, const H5B2_leaf_t *leaf, size_t *size_ptr) { - FUNC_ENTER_NOAPI_NOERR + FUNC_ENTER_STATIC_NOERR /* check arguments */ HDassert(leaf); @@ -1123,5 +1123,5 @@ H5B2_cache_leaf_size(const H5F_t UNUSED *f, const H5B2_leaf_t *leaf, size_t *siz *size_ptr = leaf->hdr->node_size; FUNC_LEAVE_NOAPI(SUCCEED) -} /* H5B2_cache_leaf_size() */ +} /* H5B2__cache_leaf_size() */ diff --git a/src/H5B2hdr.c b/src/H5B2hdr.c index c90b296..60eff61 100644 --- a/src/H5B2hdr.c +++ b/src/H5B2hdr.c @@ -413,7 +413,7 @@ done: herr_t H5B2_hdr_fuse_incr(H5B2_hdr_t *hdr) { - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_NOAPI_NOINIT_NOERR /* Sanity check */ HDassert(hdr); @@ -441,7 +441,7 @@ H5B2_hdr_fuse_incr(H5B2_hdr_t *hdr) size_t H5B2_hdr_fuse_decr(H5B2_hdr_t *hdr) { - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_NOAPI_NOINIT_NOERR /* Sanity check */ HDassert(hdr); diff --git a/src/H5B2stat.c b/src/H5B2stat.c index a8f1fbd..5e48a6f 100644 --- a/src/H5B2stat.c +++ b/src/H5B2stat.c @@ -86,7 +86,7 @@ herr_t H5B2_stat_info(H5B2_t *bt2, H5B2_stat_t *info) { - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_NOAPI_NOINIT_NOERR /* Check arguments. */ HDassert(info); diff --git a/src/H5Bcache.c b/src/H5Bcache.c index 68fb920..968c5ee 100644 --- a/src/H5Bcache.c +++ b/src/H5Bcache.c @@ -55,11 +55,11 @@ /********************/ /* Metadata cache callbacks */ -static H5B_t *H5B_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata); -static herr_t H5B_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5B_t *b, unsigned UNUSED * flags_ptr); -static herr_t H5B_dest(H5F_t *f, H5B_t *bt); -static herr_t H5B_clear(H5F_t *f, H5B_t *b, hbool_t destroy); -static herr_t H5B_compute_size(const H5F_t *f, const H5B_t *bt, size_t *size_ptr); +static H5B_t *H5B__load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata); +static herr_t H5B__flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5B_t *b, unsigned UNUSED * flags_ptr); +static herr_t H5B__dest(H5F_t *f, H5B_t *bt); +static herr_t H5B__clear(H5F_t *f, H5B_t *b, hbool_t destroy); +static herr_t H5B__compute_size(const H5F_t *f, const H5B_t *bt, size_t *size_ptr); /*********************/ @@ -69,12 +69,12 @@ static herr_t H5B_compute_size(const H5F_t *f, const H5B_t *bt, size_t *size_ptr /* H5B inherits cache-like properties from H5AC */ const H5AC_class_t H5AC_BT[1] = {{ H5AC_BT_ID, - (H5AC_load_func_t)H5B_load, - (H5AC_flush_func_t)H5B_flush, - (H5AC_dest_func_t)H5B_dest, - (H5AC_clear_func_t)H5B_clear, + (H5AC_load_func_t)H5B__load, + (H5AC_flush_func_t)H5B__flush, + (H5AC_dest_func_t)H5B__dest, + (H5AC_clear_func_t)H5B__clear, (H5AC_notify_func_t)NULL, - (H5AC_size_func_t)H5B_compute_size, + (H5AC_size_func_t)H5B__compute_size, }}; /*******************/ @@ -84,7 +84,7 @@ const H5AC_class_t H5AC_BT[1] = {{ /*------------------------------------------------------------------------- - * Function: H5B_load + * Function: H5B__load * * Purpose: Loads a B-tree node from the disk. * @@ -98,7 +98,7 @@ const H5AC_class_t H5AC_BT[1] = {{ *------------------------------------------------------------------------- */ static H5B_t * -H5B_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata) +H5B__load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata) { H5B_t *bt = NULL; /* Pointer to the deserialized B-tree node */ H5B_cache_ud_t *udata = (H5B_cache_ud_t *)_udata; /* User data for callback */ @@ -108,7 +108,7 @@ H5B_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata) unsigned u; /* Local index variable */ H5B_t *ret_value; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_STATIC /* Check arguments */ HDassert(f); @@ -189,11 +189,11 @@ done: HDONE_ERROR(H5E_BTREE, H5E_CANTFREE, NULL, "unable to destroy B-tree node") FUNC_LEAVE_NOAPI(ret_value) -} /* end H5B_load() */ /*lint !e818 Can't make udata a pointer to const */ +} /* end H5B__load() */ /*lint !e818 Can't make udata a pointer to const */ /*------------------------------------------------------------------------- - * Function: H5B_flush + * Function: H5B__flush * * Purpose: Flushes a dirty B-tree node to disk. * @@ -206,12 +206,12 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5B_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5B_t *bt, unsigned UNUSED * flags_ptr) +H5B__flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5B_t *bt, unsigned UNUSED * flags_ptr) { H5B_shared_t *shared; /* Pointer to shared B-tree info */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_STATIC /* check arguments */ HDassert(f); @@ -275,16 +275,16 @@ H5B_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5B_t *bt, uns } /* end if */ if(destroy) - if(H5B_dest(f, bt) < 0) + if(H5B__dest(f, bt) < 0) HGOTO_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to destroy B-tree node") done: FUNC_LEAVE_NOAPI(ret_value) -} /* end H5B_flush() */ +} /* end H5B__flush() */ /*------------------------------------------------------------------------- - * Function: H5B_dest + * Function: H5B__dest * * Purpose: Destroys a B-tree node in memory. * @@ -297,11 +297,11 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5B_dest(H5F_t *f, H5B_t *bt) +H5B__dest(H5F_t *f, H5B_t *bt) { herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_STATIC /* * Check arguments. @@ -333,11 +333,11 @@ H5B_dest(H5F_t *f, H5B_t *bt) done: FUNC_LEAVE_NOAPI(ret_value) -} /* end H5B_dest() */ +} /* end H5B__dest() */ /*------------------------------------------------------------------------- - * Function: H5B_clear + * Function: H5B__clear * * Purpose: Mark a B-tree node in memory as non-dirty. * @@ -350,11 +350,11 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5B_clear(H5F_t *f, H5B_t *bt, hbool_t destroy) +H5B__clear(H5F_t *f, H5B_t *bt, hbool_t destroy) { herr_t ret_value = SUCCEED; - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_STATIC /* * Check arguments. @@ -365,16 +365,16 @@ H5B_clear(H5F_t *f, H5B_t *bt, hbool_t destroy) bt->cache_info.is_dirty = FALSE; if(destroy) - if(H5B_dest(f, bt) < 0) + if(H5B__dest(f, bt) < 0) HGOTO_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to destroy B-tree node") done: FUNC_LEAVE_NOAPI(ret_value) -} /* end H5B_clear() */ +} /* end H5B__clear() */ /*------------------------------------------------------------------------- - * Function: H5B_compute_size + * Function: H5B__compute_size * * Purpose: Compute the size in bytes of the specified instance of * H5B_t on disk, and return it in *len_ptr. On failure, @@ -388,11 +388,11 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5B_compute_size(const H5F_t UNUSED *f, const H5B_t *bt, size_t *size_ptr) +H5B__compute_size(const H5F_t UNUSED *f, const H5B_t *bt, size_t *size_ptr) { H5B_shared_t *shared; /* Pointer to shared B-tree info */ - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_STATIC_NOERR /* check arguments */ HDassert(f); @@ -407,5 +407,5 @@ H5B_compute_size(const H5F_t UNUSED *f, const H5B_t *bt, size_t *size_ptr) *size_ptr = shared->sizeof_rnode; FUNC_LEAVE_NOAPI(SUCCEED) -} /* H5B_compute_size() */ +} /* H5B__compute_size() */ diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c index dd1860f..db195ca 100644 --- a/src/H5Dchunk.c +++ b/src/H5Dchunk.c @@ -307,7 +307,6 @@ H5D__chunk_direct_write(const H5D_t *dset, hid_t dxpl_id, uint32_t filters, hsiz const H5D_rdcc_t *rdcc = &(dset->shared->cache.chunk); /*raw data chunk cache */ int space_ndims; /* Dataset's space rank */ hsize_t space_dim[H5O_LAYOUT_NDIMS]; /* Dataset's dataspace dimensions */ - H5FD_t *lf; herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_STATIC_TAG(dxpl_id, dset->oloc.addr, FAIL) diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c index f907e0a..e5775ab 100644 --- a/src/H5FDmulti.c +++ b/src/H5FDmulti.c @@ -1783,7 +1783,6 @@ H5FD_multi_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, htri_t prop_exists = FALSE; /* Whether the multi VFD DXPL property already exists */ H5FD_mem_t mt, mmt, hi = H5FD_MEM_DEFAULT; haddr_t start_addr = 0; - static const char *func = "H5FD_multi_read"; /* Function Name for error reporting */ dxpl_id = dxpl_id; /* Suppress compiler warning */ /* Clear the error stack */ @@ -1836,7 +1835,6 @@ H5FD_multi_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, htri_t prop_exists = FALSE; /* Whether the multi VFD DXPL property already exists */ H5FD_mem_t mt, mmt, hi = H5FD_MEM_DEFAULT; haddr_t start_addr = 0; - static const char *func = "H5FD_multi_read"; /* Function Name for error reporting */ dxpl_id = dxpl_id; /* Suppress compiler warning */ /* Clear the error stack */ diff --git a/src/H5G.c b/src/H5G.c index bd4ad9b..4f2d0e1 100644 --- a/src/H5G.c +++ b/src/H5G.c @@ -495,14 +495,7 @@ done: hid_t H5Gget_create_plist(hid_t group_id) { - H5O_linfo_t linfo; /* Link info message */ - htri_t ginfo_exists; - htri_t linfo_exists; - htri_t pline_exists; H5G_t *group = NULL; - H5P_genplist_t *gcpl_plist; - H5P_genplist_t *new_plist; - hid_t new_gcpl_id = FAIL; hid_t ret_value = FAIL; FUNC_ENTER_API(FAIL) diff --git a/src/H5Gent.c b/src/H5Gent.c index 17893fa..2cef9f7 100644 --- a/src/H5Gent.c +++ b/src/H5Gent.c @@ -361,7 +361,7 @@ H5G__ent_copy(H5G_entry_t *dst, const H5G_entry_t *src, H5_copy_depth_t depth) void H5G__ent_reset(H5G_entry_t *ent) { - FUNC_ENTER_PACKAGE + FUNC_ENTER_PACKAGE_NOERR /* Check arguments */ HDassert(ent); diff --git a/src/H5Pocpl.c b/src/H5Pocpl.c index 2166020..32f6a1b 100644 --- a/src/H5Pocpl.c +++ b/src/H5Pocpl.c @@ -1195,7 +1195,6 @@ htri_t H5P_filter_in_pline(H5P_genplist_t *plist, H5Z_filter_t id) { H5O_pline_t pline; /* Filter pipeline */ - H5Z_filter_info_t *filter; /* Pointer to filter information */ htri_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) diff --git a/src/H5dbg.c b/src/H5dbg.c index 5441895..2039a51 100644 --- a/src/H5dbg.c +++ b/src/H5dbg.c @@ -83,7 +83,7 @@ H5_buffer_dump(FILE *stream, int indent, const uint8_t *buf, { size_t u, v; /* Local index variable */ - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_NOAPI_NOINIT_NOERR /* * Check arguments. -- cgit v0.12