diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2009-10-19 16:07:28 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-10-19 16:07:28 +0200 |
commit | 36df04837ad54a4eb559e5c69a81aeeb4d981a72 (patch) | |
tree | 3685f248b18cbab68ad7a8dd5625932a2adab361 | |
parent | 3b3ccdc5bc530e824a55ebc8d57c34f0ca6a30c9 (diff) | |
download | busybox-w32-36df04837ad54a4eb559e5c69a81aeeb4d981a72.tar.gz busybox-w32-36df04837ad54a4eb559e5c69a81aeeb4d981a72.tar.bz2 busybox-w32-36df04837ad54a4eb559e5c69a81aeeb4d981a72.zip |
randomconfig fixes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | include/libbb.h | 1 | ||||
-rw-r--r-- | networking/telnetd.c | 4 | ||||
-rw-r--r-- | procps/top.c | 2 | ||||
-rw-r--r-- | shell/ash.c | 2 |
4 files changed, 7 insertions, 2 deletions
diff --git a/include/libbb.h b/include/libbb.h index 6e629d187..97dbe8687 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
@@ -1271,6 +1271,7 @@ line_input_t *new_line_input_t(int flags) FAST_FUNC; | |||
1271 | */ | 1271 | */ |
1272 | int read_line_input(const char* prompt, char* command, int maxsize, line_input_t *state) FAST_FUNC; | 1272 | int read_line_input(const char* prompt, char* command, int maxsize, line_input_t *state) FAST_FUNC; |
1273 | #else | 1273 | #else |
1274 | #define MAX_HISTORY 0 | ||
1274 | int read_line_input(const char* prompt, char* command, int maxsize) FAST_FUNC; | 1275 | int read_line_input(const char* prompt, char* command, int maxsize) FAST_FUNC; |
1275 | #define read_line_input(prompt, command, maxsize, state) \ | 1276 | #define read_line_input(prompt, command, maxsize, state) \ |
1276 | read_line_input(prompt, command, maxsize) | 1277 | read_line_input(prompt, command, maxsize) |
diff --git a/networking/telnetd.c b/networking/telnetd.c index 2a0ace5cb..163efaa42 100644 --- a/networking/telnetd.c +++ b/networking/telnetd.c | |||
@@ -562,13 +562,15 @@ int telnetd_main(int argc UNUSED_PARAM, char **argv) | |||
562 | } | 562 | } |
563 | 563 | ||
564 | { | 564 | { |
565 | struct timeval tv; | ||
566 | struct timeval *tv_ptr = NULL; | 565 | struct timeval *tv_ptr = NULL; |
566 | #if ENABLE_FEATURE_TELNETD_INETD_WAIT | ||
567 | struct timeval tv; | ||
567 | if ((opt & OPT_WAIT) && !G.sessions) { | 568 | if ((opt & OPT_WAIT) && !G.sessions) { |
568 | tv.tv_sec = sec_linger; | 569 | tv.tv_sec = sec_linger; |
569 | tv.tv_usec = 0; | 570 | tv.tv_usec = 0; |
570 | tv_ptr = &tv; | 571 | tv_ptr = &tv; |
571 | } | 572 | } |
573 | #endif | ||
572 | count = select(G.maxfd + 1, &rdfdset, &wrfdset, NULL, tv_ptr); | 574 | count = select(G.maxfd + 1, &rdfdset, &wrfdset, NULL, tv_ptr); |
573 | } | 575 | } |
574 | if (count == 0) /* "telnetd -w SEC" timed out */ | 576 | if (count == 0) /* "telnetd -w SEC" timed out */ |
diff --git a/procps/top.c b/procps/top.c index 9e8ad1d1f..252f6f74b 100644 --- a/procps/top.c +++ b/procps/top.c | |||
@@ -513,8 +513,8 @@ static NOINLINE void display_process_list(int lines_rem, int scr_width) | |||
513 | /* xxx_shift and xxx_scale variables allow us to replace | 513 | /* xxx_shift and xxx_scale variables allow us to replace |
514 | * expensive divides with multiply and shift */ | 514 | * expensive divides with multiply and shift */ |
515 | unsigned pmem_shift, pmem_scale, pmem_half; | 515 | unsigned pmem_shift, pmem_scale, pmem_half; |
516 | unsigned tmp_unsigned; | ||
517 | #if ENABLE_FEATURE_TOP_CPU_USAGE_PERCENTAGE | 516 | #if ENABLE_FEATURE_TOP_CPU_USAGE_PERCENTAGE |
517 | unsigned tmp_unsigned; | ||
518 | unsigned pcpu_shift, pcpu_scale, pcpu_half; | 518 | unsigned pcpu_shift, pcpu_scale, pcpu_half; |
519 | unsigned busy_jifs; | 519 | unsigned busy_jifs; |
520 | #endif | 520 | #endif |
diff --git a/shell/ash.c b/shell/ash.c index d81dbd3f5..481b84138 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
@@ -53,6 +53,8 @@ | |||
53 | #include "math.h" | 53 | #include "math.h" |
54 | #if ENABLE_ASH_RANDOM_SUPPORT | 54 | #if ENABLE_ASH_RANDOM_SUPPORT |
55 | # include "random.h" | 55 | # include "random.h" |
56 | #else | ||
57 | # define CLEAR_RANDOM_T(rnd) ((void)0) | ||
56 | #endif | 58 | #endif |
57 | 59 | ||
58 | #if defined SINGLE_APPLET_MAIN | 60 | #if defined SINGLE_APPLET_MAIN |