From c3d9b510b4e65cd32ec9708fd369d31b77d76ea6 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Tue, 30 Mar 2004 15:41:45 -0500 Subject: [svn-r8287] Purpose: Bug fix/code cleanup Description: Copy Robb's feature in SSlib that checks that the name of the function used in the FUNC_ENTER macro is actually the name of function. Fixed a bunch of typos & copy-n-pasto's for functions with incorrect names. Platforms tested: FreeBSD 4.9 (sleipnir) w/parallel too minor to require h5committest --- src/H5A.c | 2 +- src/H5Dcontig.c | 4 ++-- src/H5Distore.c | 2 +- src/H5E.c | 2 +- src/H5F.c | 2 +- src/H5FDfphdf5.c | 2 +- src/H5FDlog.c | 2 +- src/H5FDsec2.c | 2 +- src/H5Fcontig.c | 4 ++-- src/H5Fistore.c | 2 +- src/H5Gnode.c | 2 +- src/H5O.c | 2 +- src/H5P.c | 2 +- src/H5Tconv.c | 8 ++++---- src/H5Tfields.c | 2 +- src/H5Tnative.c | 2 +- src/H5Tvlen.c | 6 +++--- src/H5private.h | 12 ++++++++++++ 18 files changed, 36 insertions(+), 24 deletions(-) diff --git a/src/H5A.c b/src/H5A.c index 48add49..dc2f29d 100644 --- a/src/H5A.c +++ b/src/H5A.c @@ -1388,7 +1388,7 @@ H5Adelete(hid_t loc_id, const char *name) int idx=0, found=-1; herr_t ret_value; - FUNC_ENTER_API(H5Aopen_name, FAIL) + FUNC_ENTER_API(H5Adelete, FAIL) H5TRACE2("e","is",loc_id,name); /* check arguments */ diff --git a/src/H5Dcontig.c b/src/H5Dcontig.c index 4e19a23..09be560 100644 --- a/src/H5Dcontig.c +++ b/src/H5Dcontig.c @@ -79,7 +79,7 @@ H5F_contig_create(H5F_t *f, hid_t dxpl_id, struct H5O_layout_t *layout) unsigned u; /* Local index variable */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5O_contig_create, FAIL); + FUNC_ENTER_NOAPI(H5F_contig_create, FAIL); /* check args */ assert(f); @@ -294,7 +294,7 @@ H5F_contig_delete(H5F_t *f, hid_t dxpl_id, const struct H5O_layout_t *layout) unsigned u; /* Local index variable */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5O_contig_delete, FAIL); + FUNC_ENTER_NOAPI(H5F_contig_delete, FAIL); /* check args */ assert(f); diff --git a/src/H5Distore.c b/src/H5Distore.c index f8ae032..95876e9 100644 --- a/src/H5Distore.c +++ b/src/H5Distore.c @@ -1990,7 +1990,7 @@ H5F_istore_allocated(H5F_t *f, hid_t dxpl_id, unsigned ndims, haddr_t addr) H5F_istore_ud1_t udata; hsize_t ret_value; /* Return value */ - FUNC_ENTER_NOAPI(H5F_istore_nchunks, 0); + FUNC_ENTER_NOAPI(H5F_istore_allocated, 0); HDmemset(&udata, 0, sizeof udata); udata.mesg.ndims = ndims; diff --git a/src/H5E.c b/src/H5E.c index 9f955f0..30e1ce9 100644 --- a/src/H5E.c +++ b/src/H5E.c @@ -567,7 +567,7 @@ H5E_close_msg_cb(void *obj_ptr, hid_t obj_id, void *key) H5E_cls_t *cls = (H5E_cls_t*)key; herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5_close_msg_cb, FAIL) + FUNC_ENTER_NOAPI(H5E_close_msg_cb, FAIL) /* Check arguments */ assert(err_msg); diff --git a/src/H5F.c b/src/H5F.c index 8d9719c..007b2bf 100644 --- a/src/H5F.c +++ b/src/H5F.c @@ -1040,7 +1040,7 @@ H5F_get_objects(const H5F_t *f, unsigned types, int max_index, hid_t *obj_id_lis H5F_olist_t olist; /* Structure to hold search results */ int ret_value; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_object) + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_objects) /* Set up search information */ olist.obj_id_list = (max_index==0 ? NULL : obj_id_list); diff --git a/src/H5FDfphdf5.c b/src/H5FDfphdf5.c index f30d25d..950fa3f 100644 --- a/src/H5FDfphdf5.c +++ b/src/H5FDfphdf5.c @@ -376,7 +376,7 @@ H5FD_fphdf5_is_captain(H5FD_t *_file) H5FD_fphdf5_t *file = (H5FD_fphdf5_t*)_file; hbool_t ret_value = FALSE; - FUNC_ENTER_NOAPI(H5FD_fphdf5_is_sap, FALSE) + FUNC_ENTER_NOAPI(H5FD_fphdf5_is_captain, FALSE) /* check args */ assert(file); diff --git a/src/H5FDlog.c b/src/H5FDlog.c index d3f2949..a705d03 100644 --- a/src/H5FDlog.c +++ b/src/H5FDlog.c @@ -946,7 +946,7 @@ H5FD_log_get_eof(H5FD_t *_file) H5FD_log_t *file = (H5FD_log_t*)_file; haddr_t ret_value; /* Return value */ - FUNC_ENTER_NOAPI(H5FD_get_get_eof, HADDR_UNDEF) + FUNC_ENTER_NOAPI(H5FD_log_get_eof, HADDR_UNDEF) /* Set return value */ ret_value=MAX(file->eof, file->eoa); diff --git a/src/H5FDsec2.c b/src/H5FDsec2.c index 6bbebd0..7478cf9 100644 --- a/src/H5FDsec2.c +++ b/src/H5FDsec2.c @@ -607,7 +607,7 @@ H5FD_sec2_get_eof(H5FD_t *_file) H5FD_sec2_t *file = (H5FD_sec2_t*)_file; haddr_t ret_value; /* Return value */ - FUNC_ENTER_NOAPI(H5FD_get_get_eof, HADDR_UNDEF) + FUNC_ENTER_NOAPI(H5FD_sec2_get_eof, HADDR_UNDEF) /* Set return value */ ret_value=MAX(file->eof, file->eoa); diff --git a/src/H5Fcontig.c b/src/H5Fcontig.c index 4e19a23..09be560 100644 --- a/src/H5Fcontig.c +++ b/src/H5Fcontig.c @@ -79,7 +79,7 @@ H5F_contig_create(H5F_t *f, hid_t dxpl_id, struct H5O_layout_t *layout) unsigned u; /* Local index variable */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5O_contig_create, FAIL); + FUNC_ENTER_NOAPI(H5F_contig_create, FAIL); /* check args */ assert(f); @@ -294,7 +294,7 @@ H5F_contig_delete(H5F_t *f, hid_t dxpl_id, const struct H5O_layout_t *layout) unsigned u; /* Local index variable */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5O_contig_delete, FAIL); + FUNC_ENTER_NOAPI(H5F_contig_delete, FAIL); /* check args */ assert(f); diff --git a/src/H5Fistore.c b/src/H5Fistore.c index f8ae032..95876e9 100644 --- a/src/H5Fistore.c +++ b/src/H5Fistore.c @@ -1990,7 +1990,7 @@ H5F_istore_allocated(H5F_t *f, hid_t dxpl_id, unsigned ndims, haddr_t addr) H5F_istore_ud1_t udata; hsize_t ret_value; /* Return value */ - FUNC_ENTER_NOAPI(H5F_istore_nchunks, 0); + FUNC_ENTER_NOAPI(H5F_istore_allocated, 0); HDmemset(&udata, 0, sizeof udata); udata.mesg.ndims = ndims; diff --git a/src/H5Gnode.c b/src/H5Gnode.c index 5e5fb4e..e188cdd 100644 --- a/src/H5Gnode.c +++ b/src/H5Gnode.c @@ -1602,7 +1602,7 @@ H5G_node_type(H5F_t *f, hid_t dxpl_id, void UNUSED *_lt_key, haddr_t addr, H5G_node_t *sn = NULL; int ret_value = H5B_ITER_CONT; - FUNC_ENTER_NOAPI(H5G_node_name, H5B_ITER_ERROR); + FUNC_ENTER_NOAPI(H5G_node_type, H5B_ITER_ERROR); /* Check arguments. */ assert(f); diff --git a/src/H5O.c b/src/H5O.c index c9fc875..07c1eec 100644 --- a/src/H5O.c +++ b/src/H5O.c @@ -1246,7 +1246,7 @@ H5O_count (H5G_entry_t *ent, hid_t type_id, hid_t dxpl_id) const H5O_class_t *type; /* Actual H5O class type for the ID */ int ret_value; /* Return value */ - FUNC_ENTER_NOAPI(H5O_count_real, FAIL); + FUNC_ENTER_NOAPI(H5O_count, FAIL); /* Check args */ assert (ent); diff --git a/src/H5P.c b/src/H5P.c index 28b112a..570684f 100644 --- a/src/H5P.c +++ b/src/H5P.c @@ -4357,7 +4357,7 @@ H5P_peek_voidp(H5P_genplist_t *plist, const char *name) { void * ret_value; /* return value */ - FUNC_ENTER_NOAPI(H5P_peek_voidp_t, NULL); + FUNC_ENTER_NOAPI(H5P_peek_voidp, NULL); assert(plist); assert(name); diff --git a/src/H5Tconv.c b/src/H5Tconv.c index fde424c..23c5adc 100644 --- a/src/H5Tconv.c +++ b/src/H5Tconv.c @@ -5991,7 +5991,7 @@ H5T_conv_ulong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, { herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5T_conv_long_llong, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_ulong_llong, FAIL); H5T_CONV_uS(ULONG, LLONG, unsigned long, long_long, -, LLONG_MAX); @@ -6689,7 +6689,7 @@ H5T_conv_double_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, { herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5T_conv_float_double, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_double_float, FAIL); H5T_CONV_Ff(DOUBLE, FLOAT, double, float, -FLT_MAX, FLT_MAX); @@ -7970,7 +7970,7 @@ H5T_conv_double_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, { herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5T_conv_double_ulong, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_double_ullong, FAIL); H5T_CONV_Fx(DOUBLE, ULLONG, double, unsigned long_long, 0, ULLONG_MAX); @@ -8600,7 +8600,7 @@ H5T_conv_f_i (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, * Shift mantissa part by exponent minus mantissa size(right shift), * or by mantissa size minus exponent(left shift). */ - H5T_bit_shift(int_buf, (expo-src.u.f.msize), buf_size); + H5T_bit_shift(int_buf, (ssize_t)(expo-src.u.f.msize), buf_size); /* Convert to integer representation if negative. * equivalent to ~(value - 1). diff --git a/src/H5Tfields.c b/src/H5Tfields.c index b8c39e1..e32763b 100644 --- a/src/H5Tfields.c +++ b/src/H5Tfields.c @@ -83,7 +83,7 @@ H5Tget_nmembers(hid_t type_id) H5T_t *dt = NULL; int ret_value; - FUNC_ENTER_API(H5Tget_num_members, FAIL) + FUNC_ENTER_API(H5Tget_nmembers, FAIL) H5TRACE1("Is","i",type_id); /* Check args */ diff --git a/src/H5Tnative.c b/src/H5Tnative.c index 25745d0..1f4e686 100644 --- a/src/H5Tnative.c +++ b/src/H5Tnative.c @@ -695,7 +695,7 @@ H5T_get_native_float(size_t size, H5T_direction_t direction, size_t *struct_alig } match=H5T_NATIVE_FLOAT_MATCH_UNKNOWN; H5T_t *ret_value; /* Return value */ - FUNC_ENTER_NOAPI(H5T_get_native_integer, NULL) + FUNC_ENTER_NOAPI(H5T_get_native_float, NULL) assert(size>0); diff --git a/src/H5Tvlen.c b/src/H5Tvlen.c index 656213e..0d510b59 100644 --- a/src/H5Tvlen.c +++ b/src/H5Tvlen.c @@ -391,7 +391,7 @@ H5T_vlen_seq_mem_read(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, void *_vl, void *bu */ /* ARGSUSED */ static herr_t -H5T_vlen_seq_mem_write(H5F_t UNUSED *f, hid_t dxpl_id, const H5T_vlen_alloc_info_t *vl_alloc_info, void *_vl, void *buf, void UNUSED *_bg, hsize_t seq_len, hsize_t base_size) +H5T_vlen_seq_mem_write(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const H5T_vlen_alloc_info_t *vl_alloc_info, void *_vl, void *buf, void UNUSED *_bg, hsize_t seq_len, hsize_t base_size) { hvl_t vl; /* Temporary hvl_t to use during operation */ size_t len; @@ -573,7 +573,7 @@ H5T_vlen_str_mem_read(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, void *_vl, void *bu */ /* ARGSUSED */ static herr_t -H5T_vlen_str_mem_write(H5F_t UNUSED *f, hid_t dxpl_id, const H5T_vlen_alloc_info_t *vl_alloc_info, void *_vl, void *buf, void UNUSED *_bg, hsize_t seq_len, hsize_t base_size) +H5T_vlen_str_mem_write(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const H5T_vlen_alloc_info_t *vl_alloc_info, void *_vl, void *buf, void UNUSED *_bg, hsize_t seq_len, hsize_t base_size) { char *t; /* Pointer to temporary buffer allocated */ size_t len; /* Maximum length of the string to copy */ @@ -627,7 +627,7 @@ H5T_vlen_str_mem_setnull(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, void *_vl, void { char *t=NULL; /* Pointer to temporary buffer allocated */ - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_vlen_str_mem_write) + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_vlen_str_mem_setnull) /* Set pointer in user's buffer with memcpy, to avoid alignment issues */ HDmemcpy(_vl,&t,sizeof(char *)); diff --git a/src/H5private.h b/src/H5private.h index 2cf58f0..ac80564 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -1144,12 +1144,24 @@ extern hbool_t H5_libinit_g; /* Has the library been initialized? */ extern hbool_t H5_MPEinit_g; /* Has the MPE Library been initialized? */ #endif +/* Check if the function name is correct (if the compiler supports __FUNCTION__) */ +#ifdef H5_HAVE_FUNCTION +#define H5_CHECK_FUNCNAME(func_name) \ + assert(func_name && !HDstrcmp(#func_name, __FUNCTION__)) +#else /* H5_HAVE_FUNCTION */ +#define H5_CHECK_FUNCNAME(func_name) \ + assert(func_name) +#endif /* H5_HAVE_FUNCTION */ + #define FUNC_ENTER_COMMON_NOFUNC(func_name,asrt) \ PABLO_SAVE (ID_ ## func_name) \ \ /* Check API status */ \ assert(asrt); \ \ + /* Check function name */ \ + H5_CHECK_FUNCNAME(func_name); \ + \ /* Start tracing */ \ PABLO_TRACE_ON (PABLO_MASK, pablo_func_id) -- cgit v0.12