diff options
| author | Leonid Lisovskiy | 2011-10-18 00:35:47 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2011-10-18 00:35:47 +0200 |
| commit | 6c9c0a1dc9de48b59c103600a1f574a4a234b3d6 (patch) | |
| tree | bc758b649ccccc95e4020431457362991155b1bd | |
| parent | cd06e06eee3ef89e45b60d7122e5518995c7f65e (diff) | |
| download | busybox-6c9c0a1dc9de48b59c103600a1f574a4a234b3d6.zip busybox-6c9c0a1dc9de48b59c103600a1f574a4a234b3d6.tar.gz | |
udhcp: IF_UDHCP_VERBOSE() macro - improve code readability
Signed-off-by: Leonid Lisovskiy <lly.dev@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | networking/udhcp/common.h | 2 | ||||
| -rw-r--r-- | networking/udhcp/dhcpc.c | 10 | ||||
| -rw-r--r-- | networking/udhcp/dhcpd.c | 4 |
3 files changed, 5 insertions, 11 deletions
diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h index 80d97e8..7862668 100644 --- a/networking/udhcp/common.h +++ b/networking/udhcp/common.h @@ -248,6 +248,7 @@ struct option_set *udhcp_find_option(struct option_set *opt_list, uint8_t code) /*** Logging ***/ #if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 1 +# define IF_UDHCP_VERBOSE(...) __VA_ARGS__ extern unsigned dhcp_verbose; # define log1(...) do { if (dhcp_verbose >= 1) bb_info_msg(__VA_ARGS__); } while (0) # if CONFIG_UDHCP_DEBUG >= 2 @@ -263,6 +264,7 @@ void udhcp_dump_packet(struct dhcp_packet *packet) FAST_FUNC; # define log3(...) ((void)0) # endif #else +# define IF_UDHCP_VERBOSE(...) # define udhcp_dump_packet(...) ((void)0) # define log1(...) ((void)0) # define log2(...) ((void)0) diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c index 3be09f4..29a6cd5 100644 --- a/networking/udhcp/dhcpc.c +++ b/networking/udhcp/dhcpc.c @@ -1077,11 +1077,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) /* Parse command line */ /* O,x: list; -T,-t,-A take numeric param */ - opt_complementary = "O::x::T+:t+:A+" -#if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 1 - ":vv" -#endif - ; + opt_complementary = "O::x::T+:t+:A+" IF_UDHCP_VERBOSE(":vv") ; IF_LONG_OPTS(applet_long_options = udhcpc_longopts;) opt = getopt32(argv, "CV:H:h:F:i:np:qRr:s:T:t:SA:O:ox:fB" USE_FOR_MMU("b") @@ -1095,9 +1091,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) , &list_O , &list_x IF_FEATURE_UDHCP_PORT(, &str_P) -#if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 1 - , &dhcp_verbose -#endif + IF_UDHCP_VERBOSE(, &dhcp_verbose) ); if (opt & (OPT_h|OPT_H)) client_config.hostname = alloc_dhcp_option(DHCP_HOST_NAME, str_h, 0); diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c index 747472d..dd55e70 100644 --- a/networking/udhcp/dhcpd.c +++ b/networking/udhcp/dhcpd.c @@ -314,9 +314,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv) #endif opt = getopt32(argv, "fSv" IF_FEATURE_UDHCP_PORT("P:", &str_P) -#if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 1 - , &dhcp_verbose -#endif + IF_UDHCP_VERBOSE(, &dhcp_verbose) ); if (!(opt & 1)) { /* no -f */ bb_daemonize_or_rexec(0, argv); |