[Settings] Introduce settings applicators.

[people/mcb30/gpxe.git] / src / net / dhcpopts.c

diff --git a/src/net/dhcpopts.c b/src/net/dhcpopts.c
index d1837be..75a9f2a 100644 (file)
--- a/src/net/dhcpopts.c
+++ b/src/net/dhcpopts.c
@@ -37,12 +37,6 @@
 /** List of registered DHCP option blocks */
 LIST_HEAD ( dhcp_option_blocks );
 
-/** Registered DHCP option applicators */
-static struct dhcp_option_applicator dhcp_option_applicators[0]
-       __table_start ( struct dhcp_option_applicator, dhcp_applicators );
-static struct dhcp_option_applicator dhcp_option_applicators_end[0]
-       __table_end ( struct dhcp_option_applicator, dhcp_applicators );
-
 /**
  * Obtain printable version of a DHCP option tag
  *
@@ -426,11 +420,11 @@ struct dhcp_option * set_dhcp_option ( struct dhcp_option_block *options,
        option = find_dhcp_option_with_encap ( options, tag, &encapsulator );
        if ( option ) {
                old_len = dhcp_option_len ( option );
-               DBG ( "Resizing DHCP option %s from length %d to %d in block "
+               DBG ( "Resizing DHCP option %s from length %d to %zd in block "
                      "%p\n", dhcp_tag_name (tag), option->len, len, options );
        } else {
                old_len = 0;
-               DBG ( "Creating DHCP option %s (length %d) in block %p\n",
+               DBG ( "Creating DHCP option %s (length %zd) in block %p\n",
                      dhcp_tag_name ( tag ), len, options );
        }
        
@@ -578,13 +572,9 @@ void delete_dhcp_option ( struct dhcp_option_block *options,
  * @ret rc             Return status code
  */
 int apply_dhcp_options ( struct dhcp_option_block *options ) {
-       struct dhcp_option_applicator *applicator;
-       struct dhcp_option *option;
        struct in_addr tftp_server;
        struct uri *uri;
        char uri_string[32];
-       unsigned int tag;
-       int rc;
 
        /* Set current working URI based on TFTP server */
        find_dhcp_ipv4_option ( options, DHCP_EB_SIADDR, &tftp_server );
@@ -596,20 +586,6 @@ int apply_dhcp_options ( struct dhcp_option_block *options ) {
        churi ( uri );
        uri_put ( uri );
 
-       /* Call all registered DHCP option applicators */
-       for ( applicator = dhcp_option_applicators ;
-             applicator < dhcp_option_applicators_end ; applicator++ ) {
-               tag = applicator->tag;
-               option = find_dhcp_option ( options, tag );
-               if ( ! option )
-                       continue;
-               if ( ( rc = applicator->apply ( tag, option ) ) != 0 ) {
-                       DBG ( "Could not apply DHCP option %s: %s\n",
-                             dhcp_tag_name ( tag ), strerror ( rc ) );
-                       return rc;
-               }
-       }
-
        return 0;
 }