svn commit: trunk/busybox/coreutils

[aldot at busybox.net]

Author: aldot
Date: 2007-01-17 11:44:59 -0800 (Wed, 17 Jan 2007)
New Revision: 17350

Log:
- manually inline tty_value_to_baud and remove string_to_baud_or_die
  (cleanup)


Modified:
   trunk/busybox/coreutils/stty.c


Changeset:
Modified: trunk/busybox/coreutils/stty.c
===================================================================
--- trunk/busybox/coreutils/stty.c	2007-01-17 19:44:24 UTC (rev 17349)
+++ trunk/busybox/coreutils/stty.c	2007-01-17 19:44:59 UTC (rev 17350)
@@ -425,17 +425,12 @@
 	return NULL;
 }
 
-static speed_t string_to_baud_or_die(const char *arg)
+static void set_speed_or_die(enum speed_setting type, const char * const arg,
+					struct termios * const mode)
 {
-	return tty_value_to_baud(xatou(arg));
-}
-
-static void set_speed_or_die(enum speed_setting type, const char *arg,
-					struct termios *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 @@
 			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 @@
 		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):