summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2017-04-21 00:19:15 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2017-04-21 00:19:15 (GMT)
commit739f413b7803c1d8fb5d0cbaef6503785a18275c (patch)
tree2a2fafd93e137665633aed7ff0d30b6d93be0b9d /src
parent5fefc12bd84843c295096330d5884dc0a1e043b0 (diff)
downloadhdf5-739f413b7803c1d8fb5d0cbaef6503785a18275c.zip
hdf5-739f413b7803c1d8fb5d0cbaef6503785a18275c.tar.gz
hdf5-739f413b7803c1d8fb5d0cbaef6503785a18275c.tar.bz2
Fixed problems that prevent bin/trace from marking up some functions.
Diffstat (limited to 'src')
-rw-r--r--src/H5.c6
-rw-r--r--src/H5PL.c22
-rw-r--r--src/H5Pfapl.c14
3 files changed, 20 insertions, 22 deletions
diff --git a/src/H5.c b/src/H5.c
index 41fb3ba..f41459c 100644
--- a/src/H5.c
+++ b/src/H5.c
@@ -944,7 +944,7 @@ H5allocate_memory(size_t size, hbool_t clear)
{
void *ret_value = NULL;
- FUNC_ENTER_API_NOINIT;
+ FUNC_ENTER_API_NOINIT
H5TRACE2("*x", "zb", size, clear);
if(clear)
@@ -985,7 +985,7 @@ H5resize_memory(void *mem, size_t size)
{
void *ret_value = NULL;
- FUNC_ENTER_API_NOINIT;
+ FUNC_ENTER_API_NOINIT
H5TRACE2("*x", "*xz", mem, size);
ret_value = H5MM_realloc(mem, size);
@@ -1009,7 +1009,7 @@ H5resize_memory(void *mem, size_t size)
herr_t
H5free_memory(void *mem)
{
- FUNC_ENTER_API_NOINIT;
+ FUNC_ENTER_API_NOINIT
H5TRACE1("e", "*x", mem);
/* At this time, it is impossible for this to fail. */
diff --git a/src/H5PL.c b/src/H5PL.c
index a083f5a..3eb3392 100644
--- a/src/H5PL.c
+++ b/src/H5PL.c
@@ -417,12 +417,13 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5PLappend(const char* plugin_path)
+H5PLappend(const char *plugin_path)
{
herr_t ret_value = SUCCEED; /* Return value */
char *dl_path = NULL;
FUNC_ENTER_API(FAIL)
+ H5TRACE1("e", "*s", plugin_path);
if(H5PL_num_paths_g == H5PL_MAX_PATH_NUM)
HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "too many directories in path for table")
if(NULL == plugin_path)
@@ -450,13 +451,14 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5PLprepend(const char* plugin_path)
+H5PLprepend(const char *plugin_path)
{
herr_t ret_value = SUCCEED; /* Return value */
char *dl_path = NULL;
unsigned int plindex;
FUNC_ENTER_API(FAIL)
+ H5TRACE1("e", "*s", plugin_path);
if(H5PL_num_paths_g == H5PL_MAX_PATH_NUM)
HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "too many directories in path for table")
if(NULL == plugin_path)
@@ -486,12 +488,13 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5PLreplace(const char* plugin_path, unsigned int index)
+H5PLreplace(const char *plugin_path, unsigned int index)
{
herr_t ret_value = SUCCEED; /* Return value */
char *dl_path = NULL;
FUNC_ENTER_API(FAIL)
+ H5TRACE2("e", "*sIu", plugin_path, index);
if(NULL == plugin_path)
HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "no path provided")
if(index >= H5PL_MAX_PATH_NUM)
@@ -520,13 +523,14 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5PLinsert(const char* plugin_path, unsigned int index)
+H5PLinsert(const char *plugin_path, unsigned int index)
{
herr_t ret_value = SUCCEED; /* Return value */
char *dl_path = NULL;
unsigned int plindex;
FUNC_ENTER_API(FAIL)
+ H5TRACE2("e", "*sIu", plugin_path, index);
if(H5PL_num_paths_g == H5PL_MAX_PATH_NUM)
HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "too many directories in path for table")
if(NULL == plugin_path)
@@ -636,14 +640,20 @@ done:
*
* Purpose: Query the size of the current list of plugin paths.
*
- * Return: Non-negative or success.
+ * Return: Plugin path size (can't indicate failure due to unsigned type)
*
*-------------------------------------------------------------------------
*/
unsigned int
H5PLsize(void)
{
- return (unsigned int)H5PL_num_paths_g;
+ unsigned int ret_value = (unsigned int)H5PL_num_paths_g;
+
+ FUNC_ENTER_API(0)
+ H5TRACE0("Iu","");
+
+done:
+ FUNC_LEAVE_API(ret_value)
} /* end H5PLsize() */
diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c
index e47a4b0..c69f3ef 100644
--- a/src/H5Pfapl.c
+++ b/src/H5Pfapl.c
@@ -4381,19 +4381,7 @@ H5P_facc_mdc_log_location_close(const char H5_ATTR_UNUSED *name, size_t H5_ATTR_
*-------------------------------------------------------------------------
*/
herr_t
-H5Pset_evict_on_close(
-#if defined(H5_HAVE_PARALLEL) && !defined(H5_DEBUG_BUILD)
- hid_t H5_ATTR_UNUSED fapl_id,
-#else
- hid_t fapl_id,
-#endif /* H5_HAVE_PARALLEL and !H5_DEBUG_BUILD */
-
-#ifdef H5_HAVE_PARALLEL
- hbool_t H5_ATTR_UNUSED evict_on_close
-#else
- hbool_t evict_on_close
-#endif /* H5_HAVE_PARALLEL */
-)
+H5Pset_evict_on_close(hid_t fapl_id, hbool_t evict_on_close)
{
H5P_genplist_t *plist; /* property list pointer */
herr_t ret_value = SUCCEED; /* return value */