traceroute: fix help text to not show -6 when traceroute6 is off

[oweals/busybox.git] / libbb / speed_table.c

diff --git a/libbb/speed_table.c b/libbb/speed_table.c
index d690d55dc435d2bc640db90150eb300c018ddd32..af676e1ebe01e240a867770e7135dfbf2caa483e 100644 (file)
--- a/libbb/speed_table.c
+++ b/libbb/speed_table.c
@@ -7,7 +7,6 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <termios.h>
 #include "libbb.h"
 
 struct speed_map {
@@ -52,11 +51,14 @@ static const struct speed_map speeds[] = {
 #ifdef B460800
        {B460800, 460800/256 + 0x8000U},
 #endif
+#ifdef B921600
+       {B921600, 921600/256 + 0x8000U},
+#endif
 };
 
-enum { NUM_SPEEDS = (sizeof(speeds) / sizeof(struct speed_map)) };
+enum { NUM_SPEEDS = ARRAY_SIZE(speeds) };
 
-unsigned long bb_baud_to_value(speed_t speed)
+unsigned FAST_FUNC tty_baud_to_value(speed_t speed)
 {
        int i = 0;
 
@@ -72,12 +74,12 @@ unsigned long bb_baud_to_value(speed_t speed)
        return 0;
 }
 
-speed_t bb_value_to_baud(unsigned long value)
+speed_t FAST_FUNC tty_value_to_baud(unsigned int value)
 {
        int i = 0;
 
        do {
-               if (value == bb_baud_to_value(speeds[i].speed)) {
+               if (value == tty_baud_to_value(speeds[i].speed)) {
                        return speeds[i].speed;
                }
        } while (++i < NUM_SPEEDS);
@@ -94,8 +96,8 @@ int main(void)
        unsigned long v;
        speed_t s;
 
-       for (v = 0 ; v < 500000 ; v++) {
-               s = bb_value_to_baud(v);
+       for (v = 0 ; v < 1000000; v++) {
+               s = tty_value_to_baud(v);
                if (s == (speed_t) -1) {
                        continue;
                }
@@ -104,8 +106,8 @@ int main(void)
 
        printf("-------------------------------\n");
 
-       for (s = 0 ; s < 010017+1 ; s++) {
-               v = bb_baud_to_value(s);
+       for (s = 0 ; s < 010017+1; s++) {
+               v = tty_baud_to_value(s);
                if (!v) {
                        continue;
                }