From 4aca87515a5083ae0e31ce3177189fd43b6d05ac Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 3 Jan 2015 13:58:15 +0100 Subject: patch to Vanilla Tomato 1.28 --- release/src/router/busybox/libbb/speed_table.c | 32 ++++++++------------------ 1 file changed, 9 insertions(+), 23 deletions(-) (limited to 'release/src/router/busybox/libbb/speed_table.c') diff --git a/release/src/router/busybox/libbb/speed_table.c b/release/src/router/busybox/libbb/speed_table.c index b04429e9..05fe66c6 100644 --- a/release/src/router/busybox/libbb/speed_table.c +++ b/release/src/router/busybox/libbb/speed_table.c @@ -4,23 +4,9 @@ * * Copyright (C) 2003 Manuel Novoa III * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include #include "libbb.h" struct speed_map { @@ -67,9 +53,9 @@ static const struct speed_map speeds[] = { #endif }; -static const int 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; @@ -85,12 +71,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); @@ -107,8 +93,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 < 500000; v++) { + s = tty_value_to_baud(v); if (s == (speed_t) -1) { continue; } @@ -117,8 +103,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; } -- cgit v1.2.3-54-g00ecf