From 145ef3ceee20c28a443bd11507c58858bea3f889 Mon Sep 17 00:00:00 2001
From: kmu <kmu@hdfgroup.org>
Date: Wed, 22 Jan 2020 19:46:12 -0600
Subject: more cleanup

---
 src/H5CX.c          | 2 +-
 test/cache_common.c | 2 +-
 test/mf.c           | 7 +++----
 test/page_buffer.c  | 4 ++--
 test/tselect.c      | 2 --
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/H5CX.c b/src/H5CX.c
index 998808b..160aa84 100644
--- a/src/H5CX.c
+++ b/src/H5CX.c
@@ -127,7 +127,7 @@
         (*head)->ctx.H5_GLUE(PROP_FIELD,_set) = TRUE;                         \
     } /* end if */                                                            \
 }
-#endif
+#endif /* defined(H5_HAVE_PARALLEL) && defined(H5_HAVE_INSTRUMENTED_LIBRARY) */
 
 #ifdef H5_HAVE_PARALLEL
 /* Macro for the duplicated code to test and set properties for a property list */
diff --git a/test/cache_common.c b/test/cache_common.c
index 696eae3..038a0ed 100644
--- a/test/cache_common.c
+++ b/test/cache_common.c
@@ -17,9 +17,9 @@
  *        This file contains common code for tests of the cache
  *        implemented in H5C.c
  */
+#include "H5private.h"
 #include "H5CXprivate.h"        /* API Contexts                         */
 #include "H5MMprivate.h"
-#include "H5private.h"
 
 #include "cache_common.h"
 
diff --git a/test/mf.c b/test/mf.c
index 6030314..141f5ec 100644
--- a/test/mf.c
+++ b/test/mf.c
@@ -38,7 +38,6 @@
 #include "H5Iprivate.h"
 #include "H5VLprivate.h"        /* Virtual Object Layer                     */
 #include "H5VMprivate.h"
-#include "H5private.h"
 
 #define FILENAME_LEN        1024
 
@@ -7529,7 +7528,7 @@ error:
  *-------------------------------------------------------------------------
  */
 static int
-set_multi_split(hid_t fapl, hsize_t pagesize, hbool_t split)
+set_multi_split(hid_t fapl, hsize_t pagesize, hbool_t is_multi_or_split)
 {
     H5FD_mem_t memb_map[H5FD_MEM_NTYPES];
     hid_t memb_fapl_arr[H5FD_MEM_NTYPES];
@@ -7538,7 +7537,7 @@ set_multi_split(hid_t fapl, hsize_t pagesize, hbool_t split)
     hbool_t relax;
     H5FD_mem_t  mt;
 
-    HDassert(split);
+    HDassert(is_multi_or_split);
 
     HDmemset(memb_name, 0, sizeof memb_name);
 
@@ -7546,7 +7545,7 @@ set_multi_split(hid_t fapl, hsize_t pagesize, hbool_t split)
     if(H5Pget_fapl_multi(fapl, memb_map, memb_fapl_arr, memb_name, memb_addr, &relax) < 0)
         TEST_ERROR
 
-    if(split) {
+    if(is_multi_or_split) {
         /* Set memb_addr aligned */
         memb_addr[H5FD_MEM_SUPER] = ((memb_addr[H5FD_MEM_SUPER] + pagesize - 1) / pagesize) * pagesize;
         memb_addr[H5FD_MEM_DRAW] = ((memb_addr[H5FD_MEM_DRAW] + pagesize - 1) / pagesize) * pagesize;
diff --git a/test/page_buffer.c b/test/page_buffer.c
index 79ba43f..21ffbf5 100644
--- a/test/page_buffer.c
+++ b/test/page_buffer.c
@@ -299,7 +299,7 @@ error:
     } H5E_END_TRY;
     return 1;
 }
-#endif
+#endif /* H5_HAVE_PARALLEL */
 
 /*
  *
@@ -2008,7 +2008,7 @@ error:
 
     return 1;
 } /* test_stats_collection */
-#endif
+#endif /* #ifndef H5_HAVE_PARALLEL */
 
 
 /*-------------------------------------------------------------------------
diff --git a/test/tselect.c b/test/tselect.c
index db7c9de..390f61f 100644
--- a/test/tselect.c
+++ b/test/tselect.c
@@ -25,9 +25,7 @@
 #define H5S_TESTING
 
 #include "testhdf5.h"
-#include "hdf5.h"
 #include "H5Spkg.h"        /* Dataspaces                */
-#include "H5private.h"
 
 #define FILENAME   "tselect.h5"
 
-- 
cgit v0.12