From d1b7c3d8d558f801e9086c5851d6ea22c02c24d1 Mon Sep 17 00:00:00 2001
From: Ralph Castain <rhc@open-mpi.org>
Date: Fri, 4 Aug 2017 20:06:16 -0700
Subject: [PATCH] Silence some compile-time warnings. Update scripts now that
 AUTHORS is gone

Signed-off-by: Ralph Castain <rhc@open-mpi.org>
---
 contrib/purge-tab-indents.pl          | 2 +-
 contrib/purge-trailing-blank-lines.pl | 2 +-
 opal/mca/hwloc/base/base.h            | 2 ++
 opal/mca/hwloc/base/hwloc_base_util.c | 8 +++-----
 orte/mca/rtc/hwloc/rtc_hwloc.c        | 7 ++-----
 5 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/contrib/purge-tab-indents.pl b/contrib/purge-tab-indents.pl
index e2900fbc1f..f5d115309c 100755
--- a/contrib/purge-tab-indents.pl
+++ b/contrib/purge-tab-indents.pl
@@ -57,7 +57,7 @@ my @exts = qw(.h .c);
 # Find the top-level OMPI source tree dir
 my $start = cwd();
 my $top = $start;
-while (! -f "$top/AUTHORS") {
+while (! -f "$top/HACKING") {
     chdir("..");
     $top = cwd();
     die "Can't find top-level directory"
diff --git a/contrib/purge-trailing-blank-lines.pl b/contrib/purge-trailing-blank-lines.pl
index 3c7570f5df..2880c5afb9 100755
--- a/contrib/purge-trailing-blank-lines.pl
+++ b/contrib/purge-trailing-blank-lines.pl
@@ -53,7 +53,7 @@ sub quiet_print {
 # Find the top-level source tree dir
 my $start = cwd();
 my $top = $start;
-while (! -f "$top/AUTHORS") {
+while (! -f "$top/HACKING") {
     chdir("..");
     $top = cwd();
     die "Can't find top-level directory"
diff --git a/opal/mca/hwloc/base/base.h b/opal/mca/hwloc/base/base.h
index 1413034866..bb4b64f598 100644
--- a/opal/mca/hwloc/base/base.h
+++ b/opal/mca/hwloc/base/base.h
@@ -165,6 +165,8 @@ OPAL_DECLSPEC int opal_hwloc_base_get_topology(void);
  */
 OPAL_DECLSPEC int opal_hwloc_base_set_topology(char *topofile);
 
+OPAL_DECLSPEC int opal_hwloc_base_filter_cpus(hwloc_topology_t topo);
+
 /**
  * Free the hwloc topology.
  */
diff --git a/opal/mca/hwloc/base/hwloc_base_util.c b/opal/mca/hwloc/base/hwloc_base_util.c
index 56a54b93bc..91c0618f60 100644
--- a/opal/mca/hwloc/base/hwloc_base_util.c
+++ b/opal/mca/hwloc/base/hwloc_base_util.c
@@ -272,11 +272,9 @@ int opal_hwloc_base_get_topology(void)
     opal_process_name_t wildcard_rank;
     char *val = NULL;
 #if HWLOC_API_VERSION >= 0x20000
-        int rc2, rc3, fd;
-        uint64_t addr, *aptr, size, *sptr;
-        char *shmemfile;
-    hwloc_obj_t root;
-    opal_hwloc_topo_data_t *sum;
+    int rc2, rc3, fd;
+    uint64_t addr, *aptr, size, *sptr;
+    char *shmemfile;
 #endif
 
     OPAL_OUTPUT_VERBOSE((2, opal_hwloc_base_framework.framework_output,
diff --git a/orte/mca/rtc/hwloc/rtc_hwloc.c b/orte/mca/rtc/hwloc/rtc_hwloc.c
index c87c01f977..b7a8a1bad1 100644
--- a/orte/mca/rtc/hwloc/rtc_hwloc.c
+++ b/orte/mca/rtc/hwloc/rtc_hwloc.c
@@ -549,7 +549,6 @@ static int find_hole(orte_rtc_hwloc_vm_hole_kind_t hkind,
 {
     unsigned long biggestbegin = 0;
     unsigned long biggestsize = 0;
-    unsigned long prevbegin = 0;
     unsigned long prevend = 0;
     orte_rtc_hwloc_vm_map_kind_t prevmkind = VM_MAP_OTHER;
     int in_libs = 0;
@@ -562,8 +561,8 @@ static int find_hole(orte_rtc_hwloc_vm_hole_kind_t hkind,
     }
 
     while (fgets(line, sizeof(line), file) != NULL) {
-        unsigned long begin, end;
-        orte_rtc_hwloc_vm_map_kind_t mkind;
+        unsigned long begin=0, end=0;
+        orte_rtc_hwloc_vm_map_kind_t mkind=VM_MAP_OTHER;
 
         if (!parse_map_line(line, &begin, &end, &mkind)) {
             opal_output_verbose(90, orte_rtc_base_framework.framework_output,
@@ -577,7 +576,6 @@ static int find_hole(orte_rtc_hwloc_vm_hole_kind_t hkind,
 
             switch (hkind) {
                 case VM_HOLE_BEGIN:
-                    assert(!prevbegin);
                     fclose(file);
                     return use_hole(0, begin, addrp, size);
 
@@ -635,7 +633,6 @@ static int find_hole(orte_rtc_hwloc_vm_hole_kind_t hkind,
           break;
         }
 
-        prevbegin = begin;
         prevend = end;
         prevmkind = mkind;