Bläddra i källkod

u-a: Rename variable a to a_new to not shadow outter scope variable

Guillem Jover 16 år sedan
förälder
incheckning
51be5fbb42
1 ändrade filer med 9 tillägg och 9 borttagningar
  1. 9 9
      utils/update-alternatives.c

+ 9 - 9
utils/update-alternatives.c

@@ -2120,19 +2120,19 @@ main(int argc, char **argv)
 	count = get_all_alternatives(&table);
 	count = get_all_alternatives(&table);
 	for (i = 0; i < count; i++) {
 	for (i = 0; i < count; i++) {
 		struct slave_link *sl;
 		struct slave_link *sl;
-		struct alternative *a = alternative_new(table[i]->d_name);
+		struct alternative *a_new = alternative_new(table[i]->d_name);
 
 
-		if (!alternative_load(a, true)) {
-			alternative_free(a);
+		if (!alternative_load(a_new, true)) {
+			alternative_free(a_new);
 			free(table[i]);
 			free(table[i]);
 			continue;
 			continue;
 		}
 		}
-		alternative_map_add(alt_map_obj, a->master_name, a);
-		alternative_map_add(alt_map_links, a->master_link, a);
-		alternative_map_add(alt_map_parent, a->master_name, a);
-		for (sl = a->slaves; sl; sl = sl->next) {
-			alternative_map_add(alt_map_links, sl->link, a);
-			alternative_map_add(alt_map_parent, sl->name, a);
+		alternative_map_add(alt_map_obj, a_new->master_name, a_new);
+		alternative_map_add(alt_map_links, a_new->master_link, a_new);
+		alternative_map_add(alt_map_parent, a_new->master_name, a_new);
+		for (sl = a_new->slaves; sl; sl = sl->next) {
+			alternative_map_add(alt_map_links, sl->link, a_new);
+			alternative_map_add(alt_map_parent, sl->name, a_new);
 		}
 		}
 
 
 		free(table[i]);
 		free(table[i]);