utils: make FOREACH macro _iter variable unique

libimobiledevice · Apr 4, 2014 · c9ff0cb · c9ff0cb
1 parent 002bf23
commit c9ff0cb
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/utils.h b/src/utils.h
@@ -54,12 +54,16 @@ void collection_remove(struct collection *col, void *element);
 int collection_count(struct collection *col);
 void collection_free(struct collection *col);
 
+#define MERGE_(a,b) a ## _ ## b
+#define LABEL_(a,b) MERGE_(a, b)
+#define UNIQUE_VAR(a) LABEL_(a, __LINE__)
+
 #define FOREACH(var, col) \
 	do { \
-		int _iter; \
-		for(_iter=0; _iter<(col)->capacity; _iter++) { \
-			if(!(col)->list[_iter]) continue; \
-			var = (col)->list[_iter];
+		int UNIQUE_VAR(_iter); \
+		for(UNIQUE_VAR(_iter)=0; UNIQUE_VAR(_iter)<(col)->capacity; UNIQUE_VAR(_iter)++) { \
+			if(!(col)->list[UNIQUE_VAR(_iter)]) continue; \
+			var = (col)->list[UNIQUE_VAR(_iter)];
 
 #define ENDFOREACH \
 		} \