Merge pull request #456 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:hdf5_1_10 to hdf5_1_10

* commit '87ceb783920c63cf374c08f17d7d601923481459':
  Fixed problems that prevent bin/trace from marking up some functions.

3 files changed, 12 insertions, 18 deletions

diff --git a/src/H5.c b/src/H5.c
index 5875906..1068fc6 100644
--- a/src/H5.c
+++ b/src/H5.c
@@ -942,7 +942,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)
@@ -983,7 +983,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);
@@ -1007,7 +1007,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 bf69d3d..02c8f00 100644
--- a/src/H5PL.c
+++ b/src/H5PL.c
@@ -638,14 +638,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 0ab0433..1b0a4b9 100644
--- a/src/H5Pfapl.c
+++ b/src/H5Pfapl.c
@@ -4379,19 +4379,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 */