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

- manually inline tty_value_to_baud and remove string_to_baud_or_die

Browse Source 
(cleanup)
This commit is contained in:
Bernhard Reutner-Fischer 2007-01-17 19:44:59 +00:00
parent 21fc740023
commit 4950f010f3
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
coreutils/stty.c
View File

@ -425,17 +425,12 @@ static tcflag_t *mode_type_flag(unsigned type, const struct termios *mode)
return NULL;
}
static speed_t string_to_baud_or_die(const char *arg)
{
return tty_value_to_baud(xatou(arg));
}
static void set_speed_or_die(enum speed_setting type, const char *arg,
struct termios *mode)
static void set_speed_or_die(enum speed_setting type, const char * const arg,
struct termios * const mode)
{
speed_t baud;
baud = string_to_baud_or_die(arg);
baud = tty_value_to_baud(xatou(arg));
if (type != output_speed) { /* either input or both */
cfsetispeed(mode, baud);
@ -1130,7 +1125,7 @@ end_option:
break;
default:
if (recover_mode(arg, &mode) == 1) break;
if (string_to_baud_or_die(arg) != (speed_t) -1) break;
if (tty_value_to_baud(xatou(arg)) != (speed_t) -1) break;
invalid_argument:
bb_error_msg_and_die("invalid argument '%s'", arg);
}
@ -1244,7 +1239,7 @@ invalid_argument:
default:
if (recover_mode(arg, &mode) == 1)
option_mask32 |= STTY_require_set_attr;
else /* true: if (string_to_baud_or_die(arg) != (speed_t) -1) */ {
else /* true: if (tty_value_to_baud(xatou(arg)) != (speed_t) -1) */{
set_speed_or_die(both_speeds, arg, &mode);
option_mask32 |= (STTY_require_set_attr | STTY_speed_was_set);
} /* else - impossible (caught in the first pass):