fixup! hwloc-reader: switch to the types_filter functions new to hwloc 2

flux-framework · Jul 14, 2020 · 7bc01d6 · 7bc01d6
1 parent 8176e89
commit 7bc01d6
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/resource/readers/resource_reader_hwloc.cpp b/resource/readers/resource_reader_hwloc.cpp
@@ -308,23 +308,26 @@ int resource_reader_hwloc_t::unpack_internal (resource_graph_t &g,
         goto done;
     }
 #else
-    if (hwloc_topology_set_io_types_filter(topo,
+    if (hwloc_topology_set_io_types_filter (topo,
                                            HWLOC_TYPE_FILTER_KEEP_IMPORTANT)
         < 0) {
-      m_err_msg += "hwloc_topology_set_io_types_filter";
-      goto done;
+        errno = EINVAL;
+        m_err_msg += "hwloc_topology_set_io_types_filter; ";
+        goto done;
     }
-    if (hwloc_topology_set_cache_types_filter(topo,
+    if (hwloc_topology_set_cache_types_filter (topo,
                                               HWLOC_TYPE_FILTER_KEEP_STRUCTURE)
         < 0) {
-      m_err_msg += "hwloc_topology_set_cache_types_filter";
-      goto done;
+        errno = EINVAL;
+        m_err_msg += "hwloc_topology_set_cache_types_filter; ";
+        goto done;
     }
-    if (hwloc_topology_set_icache_types_filter(topo,
+    if (hwloc_topology_set_icache_types_filter (topo,
                                                HWLOC_TYPE_FILTER_KEEP_STRUCTURE)
         < 0) {
-      m_err_msg += "hwloc_topology_set_icache_types_filter";
-      goto done;
+        errno = EINVAL;
+        m_err_msg += "hwloc_topology_set_icache_types_filter; ";
+        goto done;
     }
 #endif
     if ( hwloc_topology_set_xmlbuffer (topo, str.c_str (), len) != 0) {