Merge pull request #4031 from rhc54/topic/touchups

Silence some compile-time warnings. Update scripts now that AUTHORS is gone

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"

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"

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.
  */

opal/mca/hwloc/base/hwloc_base_util.c

@@ -275,8 +275,6 @@ int opal_hwloc_base_get_topology(void)
     int rc2, rc3, fd;
     uint64_t addr, *aptr, size, *sptr;
     char *shmemfile;
-    hwloc_obj_t root;
-    opal_hwloc_topo_data_t *sum;
 #endif
 
     OPAL_OUTPUT_VERBOSE((2, opal_hwloc_base_framework.framework_output,

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;