summaryrefslogtreecommitdiffstats
path: root/src/hci/tui
diff options
context:
space:
mode:
authorMichael Brown2009-03-12 20:41:40 +0100
committerMichael Brown2009-03-13 03:06:30 +0100
commit1266d7902bf7f2534ee279671d48613ef9b2434c (patch)
treea1a5b188148d983fa962a887476259768f1751d4 /src/hci/tui
parent[tcp] Avoid setting PSH flag when SYN flag is set (diff)
downloadipxe-1266d7902bf7f2534ee279671d48613ef9b2434c.tar.gz
ipxe-1266d7902bf7f2534ee279671d48613ef9b2434c.tar.xz
ipxe-1266d7902bf7f2534ee279671d48613ef9b2434c.zip
[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.
Diffstat (limited to 'src/hci/tui')
-rw-r--r--src/hci/tui/settings_ui.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/hci/tui/settings_ui.c b/src/hci/tui/settings_ui.c
index 4ab38270..61f94cde 100644
--- a/src/hci/tui/settings_ui.c
+++ b/src/hci/tui/settings_ui.c
@@ -77,12 +77,8 @@ struct setting_widget {
char value[256]; /* enough size for a DHCP string */
};
-/** Registered configuration settings */
-static struct setting all_settings[0]
- __table_start ( struct setting, settings );
-static struct setting all_settings_end[0]
- __table_end ( struct setting, settings );
-#define NUM_SETTINGS ( ( unsigned ) ( all_settings_end - all_settings ) )
+/** Number of registered configuration settings */
+#define NUM_SETTINGS table_num_entries ( struct setting, SETTINGS )
static void load_setting ( struct setting_widget *widget ) __nonnull;
static int save_setting ( struct setting_widget *widget ) __nonnull;
@@ -223,6 +219,9 @@ static int edit_setting ( struct setting_widget *widget, int key ) {
static void init_setting_index ( struct setting_widget *widget,
struct settings *settings,
unsigned int index ) {
+ struct setting *all_settings =
+ table_start ( struct setting, SETTINGS );
+
init_setting ( widget, settings, &all_settings[index],
( SETTINGS_LIST_ROW + index ), SETTINGS_LIST_COL );
}