[tables] Allow any lvalue to be used as a table iterator

Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/include/ipxe/tables.h b/src/include/ipxe/tables.h
index de5b1f297e2ebb23d8c4e9e96912ade4c57e0748..ac17f4b4b831ea8338765dc797013d9756f035ab 100644 (file)
--- a/src/include/ipxe/tables.h
+++ b/src/include/ipxe/tables.h
@@ -383,9 +383,9 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
  *
  */
 #define for_each_table_entry( pointer, table )                         \
-       for ( pointer = table_start ( table ) ;                         \
-             pointer < table_end ( table ) ;                           \
-             pointer++ )
+       for ( (pointer) = table_start ( table ) ;                       \
+             (pointer) < table_end ( table ) ;                         \
+             (pointer)++ )
 
 /**
  * Iterate through all remaining entries within a linker table
@@ -412,9 +412,9 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
  *
  */
 #define for_each_table_entry_continue( pointer, table )                        \
-       for ( pointer++ ;                                               \
-             pointer < table_end ( table ) ;                           \
-             pointer++ )
+       for ( (pointer)++ ;                                             \
+             (pointer) < table_end ( table ) ;                         \
+             (pointer)++ )
 
 /**
  * Iterate through all entries within a linker table in reverse order
@@ -438,9 +438,9 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
  *
  */
 #define for_each_table_entry_reverse( pointer, table )                 \
-       for ( pointer = ( table_end ( table ) - 1 ) ;                   \
-             pointer >= table_start ( table ) ;                        \
-             pointer-- )
+       for ( (pointer) = ( table_end ( table ) - 1 ) ;                 \
+             (pointer) >= table_start ( table ) ;                      \
+             (pointer)-- )
 
 /**
  * Iterate through all remaining entries within a linker table in reverse order
@@ -467,8 +467,8 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
  *
  */
 #define for_each_table_entry_continue_reverse( pointer, table )                \
-       for ( pointer-- ;                                               \
-             pointer >= table_start ( table ) ;                        \
-             pointer-- )
+       for ( (pointer)-- ;                                             \
+             (pointer) >= table_start ( table ) ;                      \
+             (pointer)-- )
 
 #endif /* _IPXE_TABLES_H */