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/tui/settings_ui.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'src/hci/tui')

diff --git a/src/hci/tui/settings_ui.c b/src/hci/tui/settings_ui.c
index 4ab382704..61f94cdea 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 );
 }
-- 
cgit v1.2.3-55-g7522