mirror of
https://github.com/ipxe/ipxe
synced 2025-12-31 06:49:20 +03:00
[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.
This commit is contained in:
@@ -88,10 +88,6 @@ static uint8_t dhcp_request_options_data[] = {
|
||||
DHCP_END
|
||||
};
|
||||
|
||||
/** DHCP feature codes */
|
||||
static uint8_t dhcp_features[0] __table_start ( uint8_t, dhcp_features );
|
||||
static uint8_t dhcp_features_end[0] __table_end ( uint8_t, dhcp_features );
|
||||
|
||||
/** Version number feature */
|
||||
FEATURE_VERSION ( VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH );
|
||||
|
||||
@@ -884,6 +880,7 @@ int dhcp_create_request ( struct dhcp_packet *dhcppkt,
|
||||
struct dhcp_netdev_desc dhcp_desc;
|
||||
struct dhcp_client_id client_id;
|
||||
struct dhcp_client_uuid client_uuid;
|
||||
uint8_t *dhcp_features;
|
||||
size_t dhcp_features_len;
|
||||
size_t ll_addr_len;
|
||||
ssize_t len;
|
||||
@@ -903,7 +900,8 @@ int dhcp_create_request ( struct dhcp_packet *dhcppkt,
|
||||
dhcppkt->dhcphdr->ciaddr = ciaddr;
|
||||
|
||||
/* Add options to identify the feature list */
|
||||
dhcp_features_len = ( dhcp_features_end - dhcp_features );
|
||||
dhcp_features = table_start ( uint8_t, DHCP_FEATURES );
|
||||
dhcp_features_len = table_num_entries ( uint8_t, DHCP_FEATURES );
|
||||
if ( ( rc = dhcppkt_store ( dhcppkt, DHCP_EB_ENCAP, dhcp_features,
|
||||
dhcp_features_len ) ) != 0 ) {
|
||||
DBG ( "DHCP could not set features list option: %s\n",
|
||||
|
||||
Reference in New Issue
Block a user