emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

randomconfig fixes

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2020-06-23 02:46:53 +02:00
parent 62744efa47
commit 6eb38fded2
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libbb.h
View File

@ -1385,8 +1385,10 @@ static inline void __attribute__ ((deprecated("use bb_simple_info_msg instead"))
#define bb_perror_msg_and_die(...) BB_MSG(_perror_msg_and_die, BB_MSG_KIND(__VA_ARGS__), __VA_ARGS__) #define bb_perror_msg_and_die(...) BB_MSG(_perror_msg_and_die, BB_MSG_KIND(__VA_ARGS__), __VA_ARGS__)
#define bb_herror_msg(...) BB_MSG(_herror_msg, BB_MSG_KIND(__VA_ARGS__), __VA_ARGS__) #define bb_herror_msg(...) BB_MSG(_herror_msg, BB_MSG_KIND(__VA_ARGS__), __VA_ARGS__)
#define bb_herror_msg_and_die(...) BB_MSG(_herror_msg_and_die, BB_MSG_KIND(__VA_ARGS__), __VA_ARGS__) #define bb_herror_msg_and_die(...) BB_MSG(_herror_msg_and_die, BB_MSG_KIND(__VA_ARGS__), __VA_ARGS__)
#if ENABLE_FEATURE_SYSLOG_INFO
#define bb_info_msg(...) BB_MSG(_info_msg, BB_MSG_KIND(__VA_ARGS__), __VA_ARGS__) #define bb_info_msg(...) BB_MSG(_info_msg, BB_MSG_KIND(__VA_ARGS__), __VA_ARGS__)
#endif #endif
#endif
/* We need to export XXX_main from libbusybox /* We need to export XXX_main from libbusybox
* only if we build "individual" binaries * only if we build "individual" binaries

2
networking/brctl.c
View File

@ -591,6 +591,7 @@ int brctl_main(int argc UNUSED_PARAM, char **argv)
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
#if ENABLE_FEATURE_BRCTL_FANCY
if (key == ARG_showmacs) { if (key == ARG_showmacs) {
show_bridge_macs(br); show_bridge_macs(br);
return EXIT_SUCCESS; return EXIT_SUCCESS;
@ -599,6 +600,7 @@ int brctl_main(int argc UNUSED_PARAM, char **argv)
show_bridge_stp(br); show_bridge_stp(br);
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
#endif
if (!*argv) /* All of the below need at least two arguments */ if (!*argv) /* All of the below need at least two arguments */
bb_show_usage(); bb_show_usage();