utils/annotate: abstract-out info attr operations

Signed-off-by: Brice Goglin <[email protected]>

Author: bgoglin

utils/hwloc/hwloc-annotate.c

@@ -79,53 +79,59 @@ static char *distances_transform_removeobj = NULL;
 static char *distances_transform_replace_oldtype = NULL;
 static char *distances_transform_replace_newtype = NULL;
 
+static void apply_infos(struct hwloc_infos_s *infos)
+{
+  unsigned i, j;
+  if (clearinfos) {
+    /* this may be considered dangerous, applications should not modify objects directly */
+    for(i=0; i<infos->count; i++) {
+      struct hwloc_info_s *info = &infos->array[i];
+      free(info->name);
+      free(info->value);
+    }
+    free(infos->array);
+    infos->array = NULL;
+    infos->count = 0;
+    infos->allocated = 0;
+  }
+  if (infoname) {
+    if (replaceinfos) {
+      /* this may be considered dangerous, applications should not modify objects directly */
+      for(i=0, j=0; i<infos->count; i++) {
+        struct hwloc_info_s *info = &infos->array[i];
+        if (!strcmp(infoname, info->name)) {
+          /* remove info */
+          free(info->name);
+          info->name = NULL;
+          free(info->value);
+        } else {
+          if (i != j) {
+            /* shift info to where it belongs */
+            infos->array[j].name = info->name;
+            infos->array[j].value = info->value;
+          }
+          j++;
+        }
+      }
+      infos->count = j;
+      if (!j) {
+        free(infos->array);
+        infos->array = NULL;
+        infos->allocated = 0;
+      }
+    }
+    if (infovalue)
+      hwloc_modify_infos(infos, HWLOC_MODIFY_INFOS_OP_ADD, infoname, infovalue);
+  }
+}
+
 static void apply(hwloc_topology_t topology, hwloc_obj_t obj)
 {
-	unsigned i,j;
-	if (clearinfos) {
-		/* this may be considered dangerous, applications should not modify objects directly */
-		for(i=0; i<obj->infos.count; i++) {
-			struct hwloc_info_s *info = &obj->infos.array[i];
-			free(info->name);
-			free(info->value);
-		}
-		free(obj->infos.array);
-		obj->infos.array = NULL;
-		obj->infos.count = 0;
-                obj->infos.allocated = 0;
-	}
 	if (clearuserdata) {
 		hwloc_utils_userdata_free(obj);
 	}
-	if (infoname) {
-		if (replaceinfos) {
-			/* this may be considered dangerous, applications should not modify objects directly */
-			for(i=0, j=0; i<obj->infos.count; i++) {
-				struct hwloc_info_s *info = &obj->infos.array[i];
-				if (!strcmp(infoname, info->name)) {
-					/* remove info */
-					free(info->name);
-					info->name = NULL;
-					free(info->value);
-				} else {
-					if (i != j) {
-						/* shift info to where it belongs */
-						obj->infos.array[j].name = info->name;
-						obj->infos.array[j].value = info->value;
-					}
-					j++;
-				}
-			}
-			obj->infos.count = j;
-			if (!j) {
-				free(obj->infos.array);
-				obj->infos.array = NULL;
-                                obj->infos.allocated = 0;
-			}
-		}
-		if (infovalue)
-			hwloc_obj_add_info(obj, infoname, infovalue);
-	}
+        if (infoname || clearinfos)
+          apply_infos(&obj->infos);
 	if (subtype) {
 		if (obj->subtype)
 			free(obj->subtype);