From 1266d7902bf7f2534ee279671d48613ef9b2434c Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Thu, 12 Mar 2009 19:41:40 +0000 Subject: [tables] Redefine methods for accessing linker tables Intel's C compiler (icc) chokes on the zero-length arrays that we currently use as part of the mechanism for accessing linker table entries. Abstract away the zero-length arrays, to make a port to icc easier. Introduce macros such as for_each_table_entry() to simplify the common case of iterating over all entries in a linker table. Represent table names as #defined string constants rather than unquoted literals; this avoids visual confusion between table names and C variable or type names, and also allows us to force a compilation error in the event of incorrect table names. --- src/hci/shell.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/hci/shell.c') diff --git a/src/hci/shell.c b/src/hci/shell.c index 18b1068e9..74787e3c1 100644 --- a/src/hci/shell.c +++ b/src/hci/shell.c @@ -29,11 +29,6 @@ * */ -static struct command commands[0] - __table_start ( struct command, commands ); -static struct command commands_end[0] - __table_end ( struct command, commands ); - /** The shell prompt string */ static const char shell_prompt[] = "gPXE> "; @@ -65,7 +60,7 @@ static int help_exec ( int argc __unused, char **argv __unused ) { unsigned int hpos = 0; printf ( "\nAvailable commands:\n\n" ); - for ( command = commands ; command < commands_end ; command++ ) { + for_each_table_entry ( command, COMMANDS ) { hpos += printf ( " %s", command->name ); if ( hpos > ( 16 * 4 ) ) { printf ( "\n" ); -- cgit v1.2.3-55-g7522