fix visualstudio build 5

Author: ndenoyelle

hwloc/distrib.c

@@ -105,8 +105,7 @@ hwloc_distrib_root_levels(hwloc_topology_t topology,
 		levels[i].type = types[i];
 		levels[i].depth = hwloc_get_type_depth(topology, types[i]);
 		if (levels[i].depth < 0 ){
-			fprintf(stderr, "Cannot build iterator with objects %s of negative depth.\n",
-				hwloc_obj_type_string(types[i]));
+			fprintf(stderr, "Cannot build iterator with objects %s of negative depth.\n", hwloc_obj_type_string(types[i]));
 			goto failure;
 		}
 		levels[i].index = NULL;
@@ -116,37 +115,26 @@ hwloc_distrib_root_levels(hwloc_topology_t topology,
 	}
 
 	// Sort by depth to compute arities.
-	qsort(levels,
-	      n_types,
-	      sizeof(*levels),
-	      hwloc_distrib_level_cmp_depth);	
+	qsort(levels, n_types, sizeof(*levels), hwloc_distrib_level_cmp_depth);	
 
 	// Walk from top to bottom and set arity to the maximum arity below root field.
         unsigned arity;
-	hwloc_obj_t parent=root;
-	
+	hwloc_obj_t parent;
+
+	parent=root;	
 	for (i=0; i<n_types; i++){
 		while (parent) {
-			arity = hwloc_get_nbobjs_inside_cpuset_by_depth(topology,
-								        parent->cpuset,
-									levels[i].depth);
+			arity = hwloc_get_nbobjs_inside_cpuset_by_depth(topology, parent->cpuset, levels[i].depth);
 			levels[i].arity = arity > levels[i].arity ? arity : levels[i].arity;
-			parent = hwloc_get_next_obj_inside_cpuset_by_depth(topology,
-									   root->cpuset,
-									   parent->depth, parent);
+			parent = hwloc_get_next_obj_inside_cpuset_by_depth(topology, root->cpuset, parent->depth, parent);
 		}
 
 		if (levels[i].arity == 0) {
-			fprintf(stderr, "No object of type %s below level %s.\n",
-				hwloc_obj_type_string(levels[i].type),
-				hwloc_obj_type_string(levels[i-1].type));
+			fprintf(stderr, "No object of type %s below level %s.\n", hwloc_obj_type_string(levels[i].type), hwloc_obj_type_string(levels[i-1].type));
 			goto failure;
 		}
 
-		parent = hwloc_get_obj_inside_cpuset_by_depth(topology,
-							      root->cpuset,
-							      levels[i].depth,
-							      0);
+		parent = hwloc_get_obj_inside_cpuset_by_depth(topology, root->cpuset, levels[i].depth, 0);
 	}
 
 	// Allocate levels index.
@@ -187,8 +175,7 @@ hwloc_distrib_build_iterator(hwloc_topology_t topology,
 			     const unsigned n_levels,
 			     const unsigned long flags){
 	unsigned i;
-	struct hwloc_distrib_iterator *it = malloc(sizeof(*it) +
-						   sizeof(*it->levels) * n_roots);
+	struct hwloc_distrib_iterator *it = malloc(sizeof(*it) + sizeof(*it->levels) * n_roots);
 	if(it == NULL)
 		return NULL;
 
@@ -201,7 +188,8 @@ hwloc_distrib_build_iterator(hwloc_topology_t topology,
 	for(i=0; i<n_roots; i++){
 		it->levels[i] = hwloc_distrib_root_levels(topology, roots[i], levels, n_levels, flags);
 		if(it->levels[i] == NULL){
-			while(i--){ hwloc_distrib_destroy_level(it->levels[i]); }
+			while(i--)
+				hwloc_distrib_destroy_level(it->levels[i]);
 			goto failure;
 		}
 	}
@@ -218,9 +206,7 @@ hwloc_distrib_iterator_round_robin(hwloc_topology_t topology,
 				   const hwloc_obj_type_t type,
 				   const unsigned long flags){
 	hwloc_obj_t root = hwloc_get_obj_by_depth(topology, 0, 0);
-	struct hwloc_distrib_iterator *it = malloc(sizeof(*it) +
-						   sizeof(hwloc_obj_t) + 
-						   sizeof(struct hwloc_distrib_level*));
+	struct hwloc_distrib_iterator *it = malloc(sizeof(*it) + sizeof(hwloc_obj_t) + sizeof(struct hwloc_distrib_level*));
 	if(it == NULL)
 		return NULL;
 
@@ -229,9 +215,7 @@ hwloc_distrib_iterator_round_robin(hwloc_topology_t topology,
 	it->n_roots = 1;
 	it->root_coord = 0;
 	it->n_levels = 1;
-	it->levels = (struct hwloc_distrib_level **)((char*)it +
-						     sizeof(*it) +
-						     sizeof(hwloc_obj_t));
+	it->levels = (struct hwloc_distrib_level **)((char*)it + sizeof(*it) + sizeof(hwloc_obj_t));
         *it->levels = hwloc_distrib_root_levels(topology, root, &type, 1, flags);
 
 	if (*it->levels == NULL){ free(it); return NULL; }
@@ -249,8 +233,7 @@ hwloc_distrib_iterator_scatter(hwloc_topology_t topology,
 	// Count depths with a non empty cpuset. 
 	obj = root;
 	while(obj){
-		if ((obj->cpuset != NULL && !hwloc_bitmap_iszero(obj->cpuset)) &&
-		    hwloc_get_type_depth(topology, obj->type) >= 0)
+		if ((obj->cpuset != NULL && !hwloc_bitmap_iszero(obj->cpuset)) && hwloc_get_type_depth(topology, obj->type) >= 0)
 			n++;
 		if (obj->type == type)
 			break;
@@ -262,8 +245,7 @@ hwloc_distrib_iterator_scatter(hwloc_topology_t topology,
 	// fill levels array.
 	obj = root;
 	while(obj){
-		if( obj->cpuset != NULL && !hwloc_bitmap_iszero(obj->cpuset) &&
-		    hwloc_get_type_depth(topology, obj->type) >= 0){
+		if( obj->cpuset != NULL && !hwloc_bitmap_iszero(obj->cpuset) && hwloc_get_type_depth(topology, obj->type) >= 0){
 				levels[n-1-i] = obj->type;
 				i++;
 		}
@@ -272,9 +254,7 @@ hwloc_distrib_iterator_scatter(hwloc_topology_t topology,
 		obj = obj->first_child;
 	}
 
-	struct hwloc_distrib_iterator *it = malloc(sizeof(*it) +
-						   sizeof(hwloc_obj_t) + 
-						   sizeof(struct hwloc_distrib_level*));
+	struct hwloc_distrib_iterator *it = malloc(sizeof(*it) + sizeof(hwloc_obj_t) + sizeof(struct hwloc_distrib_level*));
 
 	if(it == NULL)
 		return NULL;
@@ -284,13 +264,14 @@ hwloc_distrib_iterator_scatter(hwloc_topology_t topology,
 	it->n_roots = 1;
 	it->root_coord = 0;
 	it->n_levels = n;
-	it->levels = (struct hwloc_distrib_level **)((char*)it +
-						     sizeof(*it) +
-						     sizeof(hwloc_obj_t));
+	it->levels = (struct hwloc_distrib_level **)((char*)it + sizeof(*it) + sizeof(hwloc_obj_t));
 
         *it->levels = hwloc_distrib_root_levels(topology, root, levels, n, flags);
 
-	if (*it->levels == NULL){ free(it); return NULL; }
+	if (*it->levels == NULL){
+		free(it);
+		return NULL;
+	}
 	return it;
 }
 
@@ -312,10 +293,7 @@ hwloc_distrib_iterator_inc(struct hwloc_distrib_iterator *it){
  do_root:
 	// Sort by user_index to increment coordinates.
 	levels = it->levels[it->root_coord];
-	qsort(levels,
-	      it->n_levels,
-	      sizeof(*levels),
-	      hwloc_distrib_level_cmp_user_index);
+	qsort(levels, it->n_levels, sizeof(*levels), hwloc_distrib_level_cmp_user_index);
 
 	for (i=it->n_levels-1; i>=0; i--){
 		if(++levels[i].coord >= levels[i].arity)
@@ -344,17 +322,11 @@ hwloc_distrib_iterator_next(hwloc_topology_t topology,
 	unsigned coord;
 
 	// Sort by depth to walk objects at set coordinates.
-	qsort(levels,
-	      it->n_levels,
-	      sizeof(*levels),
-	      hwloc_distrib_level_cmp_depth);	
+	qsort(levels, it->n_levels, sizeof(*levels), hwloc_distrib_level_cmp_depth);	
 
 	for(i=0; i<it->n_levels; i++){
 		coord = levels[i].index[levels[i].coord];
-		obj = hwloc_get_obj_inside_cpuset_by_depth(topology,
-							   obj->cpuset,
-							   levels[i].depth,
-							   coord);
+		obj = hwloc_get_obj_inside_cpuset_by_depth(topology, obj->cpuset, levels[i].depth, coord);
 		if( obj == NULL)
 			return hwloc_distrib_iterator_inc(it) && hwloc_distrib_iterator_next(topology, it, next);