distances: fix the return value of get_by_type() for special types

bgoglin · bgoglin · commit 38afc20165ca · 2017-02-23T15:10:20.000+01:00
Signed-off-by: Brice Goglin &lt;Brice.Goglin@inria.fr&gt;
diff --git a/include/hwloc/distances.h b/include/hwloc/distances.h
@@ -132,8 +132,10 @@ hwloc_distances_get_by_type(hwloc_topology_t topology, hwloc_obj_type_t type,
 			    unsigned long kind, unsigned long flags)
 {
   int depth = hwloc_get_type_depth(topology, type);
-  if (depth < 0)
+  if (depth < 0) {
+    *nr = 0;
     return 0;
+  }
   return hwloc_distances_get_by_depth(topology, depth, nr, distances, kind, flags);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -132,8 +132,10 @@ hwloc_distances_get_by_type(hwloc_topology_t topology, hwloc_obj_type_t type,`
`132`	`132`	`unsigned long kind, unsigned long flags)`
`133`	`133`	`{`
`134`	`134`	`int depth = hwloc_get_type_depth(topology, type);`
`135`		`- if (depth < 0)`
	`135`	`+ if (depth < 0) {`
	`136`	`+ *nr = 0;`
`136`	`137`	`return 0;`
	`138`	`+ }`
`137`	`139`	`return hwloc_distances_get_by_depth(topology, depth, nr, distances, kind, flags);`
`138`	`140`	`}`
`139`	`141`