diff options
| author | Roy Marples <roy@marples.name> | 2008-09-05 07:22:03 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2008-09-05 07:22:03 +0000 |
| commit | da16617840a22827d78c99bab837d9be0a420c7c (patch) | |
| tree | 2d9fcadedde0a0f3e1b4b3e654972a28875e1e9b /if-options.c | |
| parent | 686608c28c738b3a990512d7ab6b22c7396b3117 (diff) | |
| download | dhcpcd-da16617840a22827d78c99bab837d9be0a420c7c.tar.xz | |
Remove some ints and replace with our option mask.
Diffstat (limited to 'if-options.c')
| -rw-r--r-- | if-options.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/if-options.c b/if-options.c index f6f9140b..7d037a4e 100644 --- a/if-options.c +++ b/if-options.c @@ -257,14 +257,16 @@ parse_option(struct if_options *ifo, int opt, const char *arg) struct in_addr addr; switch(opt) { - case 'b': - ifo->options |= DHCPCD_BACKGROUND; + case 'b': /* FALLTHROUGH */ + case 'd': /* FALLTHROUGH */ + case 'k': /* FALLTHROUGH */ + case 'n': /* FALLTHROUGH */ + case 'x': /* FALLTHROUGH */ + case 'B': /* We need to handle non interface options */ break; case 'c': strlcpy(ifo->script, arg, sizeof(ifo->script)); break; - case 'd': - break; case 'h': if (arg) s = parse_string(ifo->hostname + 1, @@ -293,8 +295,6 @@ parse_option(struct if_options *ifo, int opt, const char *arg) } *ifo->vendorclassid = (uint8_t)s; break; - case 'k': - break; case 'l': if (*arg == '-') { logger(LOG_ERR, @@ -315,8 +315,6 @@ parse_option(struct if_options *ifo, int opt, const char *arg) return -1; } break; - case 'n': - break; case 'o': if (make_option_mask(ifo->requestmask, arg, 1) != 0) { logger(LOG_ERR, "unknown option `%s'", arg); @@ -417,16 +415,11 @@ parse_option(struct if_options *ifo, int opt, const char *arg) ifo->vendor[0] += s + 2; } break; - case 'x': - break; case 'A': ifo->options &= ~DHCPCD_ARP; /* IPv4LL requires ARP */ ifo->options &= ~DHCPCD_IPV4LL; break; - case 'B': - ifo->options &= ~DHCPCD_DAEMONISE; - break; case 'C': /* Commas to spaces for shell */ while ((p = strchr(arg, ','))) |