aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2001-02-18 20:13:18 +0000
committerEric Andersen <andersen@codepoet.org>2001-02-18 20:13:18 +0000
commit963791a9e9fb06ea515089925f95cf413374c1bc (patch)
tree2cbea90fc04e0f7ae1a4966e90e061495b121da8
parentf1bbb22dca4d39aa227246f4c2ee90acd7e512a4 (diff)
downloadbusybox-w32-963791a9e9fb06ea515089925f95cf413374c1bc.tar.gz
busybox-w32-963791a9e9fb06ea515089925f95cf413374c1bc.tar.bz2
busybox-w32-963791a9e9fb06ea515089925f95cf413374c1bc.zip
Another patch from Vladimir to eliminate obsolete junk.
-rw-r--r--coreutils/stty.c3
-rw-r--r--coreutils/tail.c8
-rw-r--r--stty.c3
-rw-r--r--tail.c8
4 files changed, 4 insertions, 18 deletions
diff --git a/coreutils/stty.c b/coreutils/stty.c
index 0fc0bfbc2..4a5aecf1d 100644
--- a/coreutils/stty.c
+++ b/coreutils/stty.c
@@ -1302,10 +1302,9 @@ static const int NUM_SPEEDS = (sizeof(speeds) / sizeof(struct speed_map));
1302static speed_t string_to_baud(const char *arg) 1302static speed_t string_to_baud(const char *arg)
1303{ 1303{
1304 int i; 1304 int i;
1305 static const struct suffix_mult stty_zerosuff = { NULL, 0 };
1306 1305
1307 for (i = 0; i < NUM_SPEEDS; ++i) 1306 for (i = 0; i < NUM_SPEEDS; ++i)
1308 if (parse_number(arg, &stty_zerosuff) == speeds[i].value) 1307 if (parse_number(arg, 0) == speeds[i].value)
1309 return speeds[i].speed; 1308 return speeds[i].speed;
1310 return (speed_t) - 1; 1309 return (speed_t) - 1;
1311} 1310}
diff --git a/coreutils/tail.c b/coreutils/tail.c
index a3b8f6d23..778c2d18b 100644
--- a/coreutils/tail.c
+++ b/coreutils/tail.c
@@ -37,12 +37,6 @@ static const struct suffix_mult tail_suffixes[] = {
37 { NULL, 0 } 37 { NULL, 0 }
38}; 38};
39 39
40#ifndef BB_FEATURE_SIMPLE_TAIL
41static const struct suffix_mult null_suffixes[] = {
42 { NULL, 0 }
43};
44#endif
45
46static const int BYTES = 0; 40static const int BYTES = 0;
47static const int LINES = 1; 41static const int LINES = 1;
48 42
@@ -96,7 +90,7 @@ int tail_main(int argc, char **argv)
96 hide_headers = 1; 90 hide_headers = 1;
97 break; 91 break;
98 case 's': 92 case 's':
99 sleep_period = parse_number(optarg, null_suffixes); 93 sleep_period = parse_number(optarg, 0);
100 break; 94 break;
101 case 'v': 95 case 'v':
102 show_headers = 1; 96 show_headers = 1;
diff --git a/stty.c b/stty.c
index 0fc0bfbc2..4a5aecf1d 100644
--- a/stty.c
+++ b/stty.c
@@ -1302,10 +1302,9 @@ static const int NUM_SPEEDS = (sizeof(speeds) / sizeof(struct speed_map));
1302static speed_t string_to_baud(const char *arg) 1302static speed_t string_to_baud(const char *arg)
1303{ 1303{
1304 int i; 1304 int i;
1305 static const struct suffix_mult stty_zerosuff = { NULL, 0 };
1306 1305
1307 for (i = 0; i < NUM_SPEEDS; ++i) 1306 for (i = 0; i < NUM_SPEEDS; ++i)
1308 if (parse_number(arg, &stty_zerosuff) == speeds[i].value) 1307 if (parse_number(arg, 0) == speeds[i].value)
1309 return speeds[i].speed; 1308 return speeds[i].speed;
1310 return (speed_t) - 1; 1309 return (speed_t) - 1;
1311} 1310}
diff --git a/tail.c b/tail.c
index a3b8f6d23..778c2d18b 100644
--- a/tail.c
+++ b/tail.c
@@ -37,12 +37,6 @@ static const struct suffix_mult tail_suffixes[] = {
37 { NULL, 0 } 37 { NULL, 0 }
38}; 38};
39 39
40#ifndef BB_FEATURE_SIMPLE_TAIL
41static const struct suffix_mult null_suffixes[] = {
42 { NULL, 0 }
43};
44#endif
45
46static const int BYTES = 0; 40static const int BYTES = 0;
47static const int LINES = 1; 41static const int LINES = 1;
48 42
@@ -96,7 +90,7 @@ int tail_main(int argc, char **argv)
96 hide_headers = 1; 90 hide_headers = 1;
97 break; 91 break;
98 case 's': 92 case 's':
99 sleep_period = parse_number(optarg, null_suffixes); 93 sleep_period = parse_number(optarg, 0);
100 break; 94 break;
101 case 'v': 95 case 'v':
102 show_headers = 1; 96 show_headers = 1;