diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2020-06-23 02:46:53 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2020-06-23 02:46:53 +0200 |
commit | 6eb38fded2f459f2828121a2f6b1499da2677553 (patch) | |
tree | 3762da91bad8762ff3666d4936460b6dc914a15e | |
parent | 62744efa472886ea8fdeb262dcb184974e3f88de (diff) | |
download | busybox-w32-6eb38fded2f459f2828121a2f6b1499da2677553.tar.gz busybox-w32-6eb38fded2f459f2828121a2f6b1499da2677553.tar.bz2 busybox-w32-6eb38fded2f459f2828121a2f6b1499da2677553.zip |
randomconfig fixes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | include/libbb.h | 2 | ||||
-rw-r--r-- | networking/brctl.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/libbb.h b/include/libbb.h index 392c0443d..d9858f5df 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
@@ -1385,8 +1385,10 @@ static inline void __attribute__ ((deprecated("use bb_simple_info_msg instead")) | |||
1385 | #define bb_perror_msg_and_die(...) BB_MSG(_perror_msg_and_die, BB_MSG_KIND(__VA_ARGS__), __VA_ARGS__) | 1385 | #define bb_perror_msg_and_die(...) BB_MSG(_perror_msg_and_die, BB_MSG_KIND(__VA_ARGS__), __VA_ARGS__) |
1386 | #define bb_herror_msg(...) BB_MSG(_herror_msg, BB_MSG_KIND(__VA_ARGS__), __VA_ARGS__) | 1386 | #define bb_herror_msg(...) BB_MSG(_herror_msg, BB_MSG_KIND(__VA_ARGS__), __VA_ARGS__) |
1387 | #define bb_herror_msg_and_die(...) BB_MSG(_herror_msg_and_die, BB_MSG_KIND(__VA_ARGS__), __VA_ARGS__) | 1387 | #define bb_herror_msg_and_die(...) BB_MSG(_herror_msg_and_die, BB_MSG_KIND(__VA_ARGS__), __VA_ARGS__) |
1388 | #if ENABLE_FEATURE_SYSLOG_INFO | ||
1388 | #define bb_info_msg(...) BB_MSG(_info_msg, BB_MSG_KIND(__VA_ARGS__), __VA_ARGS__) | 1389 | #define bb_info_msg(...) BB_MSG(_info_msg, BB_MSG_KIND(__VA_ARGS__), __VA_ARGS__) |
1389 | #endif | 1390 | #endif |
1391 | #endif | ||
1390 | 1392 | ||
1391 | /* We need to export XXX_main from libbusybox | 1393 | /* We need to export XXX_main from libbusybox |
1392 | * only if we build "individual" binaries | 1394 | * only if we build "individual" binaries |
diff --git a/networking/brctl.c b/networking/brctl.c index 25640246d..68725f93c 100644 --- a/networking/brctl.c +++ b/networking/brctl.c | |||
@@ -591,6 +591,7 @@ int brctl_main(int argc UNUSED_PARAM, char **argv) | |||
591 | return EXIT_SUCCESS; | 591 | return EXIT_SUCCESS; |
592 | } | 592 | } |
593 | 593 | ||
594 | #if ENABLE_FEATURE_BRCTL_FANCY | ||
594 | if (key == ARG_showmacs) { | 595 | if (key == ARG_showmacs) { |
595 | show_bridge_macs(br); | 596 | show_bridge_macs(br); |
596 | return EXIT_SUCCESS; | 597 | return EXIT_SUCCESS; |
@@ -599,6 +600,7 @@ int brctl_main(int argc UNUSED_PARAM, char **argv) | |||
599 | show_bridge_stp(br); | 600 | show_bridge_stp(br); |
600 | return EXIT_SUCCESS; | 601 | return EXIT_SUCCESS; |
601 | } | 602 | } |
603 | #endif | ||
602 | 604 | ||
603 | if (!*argv) /* All of the below need at least two arguments */ | 605 | if (!*argv) /* All of the below need at least two arguments */ |
604 | bb_show_usage(); | 606 | bb_show_usage(); |