diff options
author | rgrimes <rgrimes@FreeBSD.org> | 1995-05-30 06:41:30 +0000 |
---|---|---|
committer | rgrimes <rgrimes@FreeBSD.org> | 1995-05-30 06:41:30 +0000 |
commit | a14d555c873398b14776ca4f2c33f9c69617afb9 (patch) | |
tree | 350f6f98843363254f9afe467ae0c92d5a9d7f43 /usr.bin/tip/libacu | |
parent | f3a2b348daf9fa6063c38d2d69563f732a2f80e7 (diff) | |
download | FreeBSD-src-a14d555c873398b14776ca4f2c33f9c69617afb9.zip FreeBSD-src-a14d555c873398b14776ca4f2c33f9c69617afb9.tar.gz |
Remove trailing whitespace.
Diffstat (limited to 'usr.bin/tip/libacu')
-rw-r--r-- | usr.bin/tip/libacu/courier.c | 2 | ||||
-rw-r--r-- | usr.bin/tip/libacu/hayes.c | 16 | ||||
-rw-r--r-- | usr.bin/tip/libacu/multitech.c | 30 | ||||
-rw-r--r-- | usr.bin/tip/libacu/t3000.c | 2 | ||||
-rw-r--r-- | usr.bin/tip/libacu/tod.c | 10 | ||||
-rw-r--r-- | usr.bin/tip/libacu/unidialer.c | 44 |
6 files changed, 52 insertions, 52 deletions
diff --git a/usr.bin/tip/libacu/courier.c b/usr.bin/tip/libacu/courier.c index f4aeab3..84c710f 100644 --- a/usr.bin/tip/libacu/courier.c +++ b/usr.bin/tip/libacu/courier.c @@ -269,7 +269,7 @@ coursync() buf[len] = '\0'; printf("coursync: (\"%s\")\n\r", buf); #endif - if (index(buf, '0') || + if (index(buf, '0') || (index(buf, 'O') && index(buf, 'K'))) return(1); } diff --git a/usr.bin/tip/libacu/hayes.c b/usr.bin/tip/libacu/hayes.c index 6cc6c06..dcce6a5 100644 --- a/usr.bin/tip/libacu/hayes.c +++ b/usr.bin/tip/libacu/hayes.c @@ -48,13 +48,13 @@ static char sccsid[] = "@(#)hayes.c 8.1 (Berkeley) 6/6/93"; * before modem is hung up, removal of the DTR signal * has no effect (except that it prevents the modem from * recognizing commands). - * (by Helge Skrivervik, Calma Company, Sunnyvale, CA. 1984) + * (by Helge Skrivervik, Calma Company, Sunnyvale, CA. 1984) */ /* * TODO: * It is probably not a good idea to switch the modem * state between 'verbose' and terse (status messages). - * This should be kicked out and we should use verbose + * This should be kicked out and we should use verbose * mode only. This would make it consistent with normal * interactive use thru the command 'tip dialer'. */ @@ -209,23 +209,23 @@ error_rep(c) case '1': printf("CONNECT"); break; - + case '2': printf("RING"); break; - + case '3': printf("NO CARRIER"); break; - + case '4': printf("ERROR in input"); break; - + case '5': printf("CONNECT 1200"); break; - + default: printf("Unknown Modem error: %c (0x%x)", c, c); } @@ -290,7 +290,7 @@ hay_sync() ioctl(FD, FIONREAD, &len); if (len) { len = read(FD, dumbuf, min(len, DUMBUFLEN)); - if (index(dumbuf, '0') || + if (index(dumbuf, '0') || (index(dumbuf, 'O') && index(dumbuf, 'K'))) return(1); #ifdef DEBUG diff --git a/usr.bin/tip/libacu/multitech.c b/usr.bin/tip/libacu/multitech.c index 85cd343..41d42b3 100644 --- a/usr.bin/tip/libacu/multitech.c +++ b/usr.bin/tip/libacu/multitech.c @@ -57,8 +57,8 @@ static CONST char *reset_command = "\rATZ\r"; static CONST char *init_string = "AT$BA0$SB38400&E1&E4&E13&E15Q0V1X4E0S0=0\r"; static CONST char *escape_sequence = "+++"; /* return to command escape sequence */ static CONST int lock_baud = 1; -static CONST unsigned int intercharacter_delay = 20; -static CONST unsigned int intercommand_delay = 250; +static CONST unsigned int intercharacter_delay = 20; +static CONST unsigned int intercommand_delay = 250; static CONST unsigned int escape_guard_time = 250; static CONST unsigned int reset_delay = 2000; @@ -91,7 +91,7 @@ int multitech_dialer (register char *num, char *acu) if (lock_baud) { int i; - if ((i = speed(number(value(BAUDRATE)))) == NULL) + if ((i = speed(number(value(BAUDRATE)))) == NULL) return 0; ttysetup (i); } @@ -112,7 +112,7 @@ badsynch: #endif return (0); } - acu_nap (intercommand_delay); + acu_nap (intercommand_delay); multitech_write_str (FD, echo_off_command); /* turn off echoing */ @@ -125,7 +125,7 @@ badsynch: acu_flush (); - acu_nap (intercommand_delay); + acu_nap (intercommand_delay); multitech_write_str (FD, init_string); if (!multitech_swallow ("\r\nOK\r\n")) @@ -133,7 +133,7 @@ badsynch: fflush (stdout); - acu_nap (intercommand_delay); + acu_nap (intercommand_delay); multitech_write_str (FD, dial_command); for (cp = num; *cp; cp++) @@ -165,9 +165,9 @@ void multitech_disconnect () { /* first hang up the modem*/ ioctl (FD, TIOCCDTR, 0); - acu_nap (escape_guard_time); + acu_nap (escape_guard_time); ioctl (FD, TIOCSDTR, 0); - acu_nap (escape_guard_time); + acu_nap (escape_guard_time); /* * If not strapped for DTR control, try to get command mode. */ @@ -326,19 +326,19 @@ static int multitechsync () char buf[40]; while (already++ < MAXRETRY) { - acu_nap (intercommand_delay); + acu_nap (intercommand_delay); ioctl (FD, TIOCFLUSH, 0); /* flush any clutter */ multitech_write_str (FD, reset_command); /* reset modem */ bzero(buf, sizeof(buf)); - acu_nap (reset_delay); + acu_nap (reset_delay); ioctl (FD, FIONREAD, &len); if (len) { len = read(FD, buf, sizeof(buf)); -#ifdef DEBUG +#ifdef DEBUG buf [len] = '\0'; printf("multitechsync: (\"%s\")\n\r", buf); #endif - if (index(buf, '0') || + if (index(buf, '0') || (index(buf, 'O') && index(buf, 'K'))) return(1); } @@ -354,12 +354,12 @@ static int multitechsync () * Toggle DTR to force anyone off that might have left * the modem connected. */ - acu_nap (escape_guard_time); + acu_nap (escape_guard_time); ioctl (FD, TIOCCDTR, 0); - acu_nap (escape_guard_time); + acu_nap (escape_guard_time); ioctl (FD, TIOCSDTR, 0); } - acu_nap (intercommand_delay); + acu_nap (intercommand_delay); multitech_write_str (FD, reset_command); return (0); } diff --git a/usr.bin/tip/libacu/t3000.c b/usr.bin/tip/libacu/t3000.c index 1f1a1f0..1c9f472 100644 --- a/usr.bin/tip/libacu/t3000.c +++ b/usr.bin/tip/libacu/t3000.c @@ -285,7 +285,7 @@ if (len == 0) len = 1; buf[len] = '\0'; printf("t3000_sync: (\"%s\")\n\r", buf); #endif - if (index(buf, '0') || + if (index(buf, '0') || (index(buf, 'O') && index(buf, 'K'))) return(1); } diff --git a/usr.bin/tip/libacu/tod.c b/usr.bin/tip/libacu/tod.c index 62ccddc..f585063 100644 --- a/usr.bin/tip/libacu/tod.c +++ b/usr.bin/tip/libacu/tod.c @@ -46,27 +46,27 @@ int tod_cmp (const struct timeval *a, const struct timeval *b) /* TOD < command */ -int tod_lt (const struct timeval *a, const struct timeval *b) +int tod_lt (const struct timeval *a, const struct timeval *b) { return tod_cmp (a, b) < 0; } -int tod_gt (const struct timeval *a, const struct timeval *b) +int tod_gt (const struct timeval *a, const struct timeval *b) { return tod_cmp (a, b) > 0; } -int tod_lte (const struct timeval *a, const struct timeval *b) +int tod_lte (const struct timeval *a, const struct timeval *b) { return tod_cmp (a, b) <= 0; } -int tod_gte (const struct timeval *a, const struct timeval *b) +int tod_gte (const struct timeval *a, const struct timeval *b) { return tod_cmp (a, b) >= 0; } -int tod_eq (const struct timeval *a, const struct timeval *b) +int tod_eq (const struct timeval *a, const struct timeval *b) { return tod_cmp (a, b) == 0; } diff --git a/usr.bin/tip/libacu/unidialer.c b/usr.bin/tip/libacu/unidialer.c index 0a1f00c..3d2701d 100644 --- a/usr.bin/tip/libacu/unidialer.c +++ b/usr.bin/tip/libacu/unidialer.c @@ -85,8 +85,8 @@ static char *init_string; static char *escape_sequence; static int hw_flow_control; static int lock_baud; -static unsigned int intercharacter_delay; -static unsigned int intercommand_delay; +static unsigned int intercharacter_delay; +static unsigned int intercommand_delay; static unsigned int escape_guard_time; static unsigned int reset_delay; @@ -157,8 +157,8 @@ void dumpmodemparms (char *modem) print_str (init_string); print_str (escape_sequence); print_num (lock_baud); - print_num (intercharacter_delay); - print_num (intercommand_delay); + print_num (intercharacter_delay); + print_num (intercommand_delay); print_num (escape_guard_time); print_num (reset_delay); printf ("\n"); @@ -175,7 +175,7 @@ static int getmodemparms (const char *modem) ndx = 0; - if (modempath != NULL) + if (modempath != NULL) db_array [ndx++] = modempath; db_array [ndx++] = _PATH_MODEMS; @@ -336,9 +336,9 @@ int unidialer_get_modem_response (char *buf, int bufsz, int response_timeout) } } break; - + case 1: - if (read (FD, &c, 1) == 1) + if (read (FD, &c, 1) == 1) { if (c == '\n') { @@ -356,9 +356,9 @@ int unidialer_get_modem_response (char *buf, int bufsz, int response_timeout) } } break; - + case 2: - if (read (FD, &c, 1) == 1) + if (read (FD, &c, 1) == 1) { if (c == '\r') ++state; @@ -366,9 +366,9 @@ int unidialer_get_modem_response (char *buf, int bufsz, int response_timeout) *p++ = c; } break; - + case 3: - if (read (FD, &c, 1) == 1) + if (read (FD, &c, 1) == 1) { if (c == '\n') { @@ -416,7 +416,7 @@ static int unidialer_dialer (register char *num, char *acu) if (lock_baud) { int i; - if ((i = speed(number(value(BAUDRATE)))) == NULL) + if ((i = speed(number(value(BAUDRATE)))) == NULL) return 0; ttysetup (i); } @@ -694,19 +694,19 @@ static int unidialersync () char buf[40]; while (already++ < MAXRETRY) { - acu_nap (intercommand_delay); + acu_nap (intercommand_delay); acu_flush (); /* flush any clutter */ unidialer_write_str (FD, reset_command); /* reset modem */ bzero(buf, sizeof(buf)); - acu_nap (reset_delay); + acu_nap (reset_delay); ioctl (FD, FIONREAD, &len); if (len) { len = read(FD, buf, sizeof(buf)); -#ifdef DEBUG +#ifdef DEBUG buf [len] = '\0'; printf("unidialersync (%s): (\"%s\")\n\r", modem_name, buf); #endif - if (index(buf, '0') || + if (index(buf, '0') || (index(buf, 'O') && index(buf, 'K'))) return(1); } @@ -722,12 +722,12 @@ static int unidialersync () * Toggle DTR to force anyone off that might have left * the modem connected. */ - acu_nap (escape_guard_time); + acu_nap (escape_guard_time); ioctl (FD, TIOCCDTR, 0); - acu_nap (1000); + acu_nap (1000); ioctl (FD, TIOCSDTR, 0); } - acu_nap (intercommand_delay); + acu_nap (intercommand_delay); unidialer_write_str (FD, reset_command); return (0); } @@ -747,12 +747,12 @@ static void unidialer_modem_cmd (int fd, const char *cmd) naptime = oldt.tv_sec * 1000 + oldt.tv_usec / 1000; if (naptime > intercommand_delay) { -#ifdef DEBUG +#ifdef DEBUG printf ("unidialer_modem_cmd: suspicious naptime (%u ms)\r\n", naptime); #endif naptime = intercommand_delay; } -#ifdef DEBUG +#ifdef DEBUG printf ("unidialer_modem_cmd: delaying %u ms\r\n", naptime); #endif acu_nap (naptime); @@ -760,7 +760,7 @@ static void unidialer_modem_cmd (int fd, const char *cmd) unidialer_write_str (fd, cmd); tod_gettime (&oldt); newt.tv_sec = 0; - newt.tv_usec = intercommand_delay; + newt.tv_usec = intercommand_delay; tod_addto (&oldt, &newt); } |