diff options
| author | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2003-04-08 20:21:30 +0000 |
|---|---|---|
| committer | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2003-04-08 20:21:30 +0000 |
| commit | fa5da3b717c54084f2b5fa831c89ba4a91017961 (patch) | |
| tree | 1d511f7c53fb01b0734ea99fec163dad86a7e5dc /usr.bin/ssh/ttymodes.c | |
| parent | 8dba2b4bcef507211128ecdce278b89a9ff639be (diff) | |
rename log() into logit() to avoid name conflict. markus ok, from netbsd
Diffstat (limited to 'usr.bin/ssh/ttymodes.c')
| -rw-r--r-- | usr.bin/ssh/ttymodes.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/usr.bin/ssh/ttymodes.c b/usr.bin/ssh/ttymodes.c index 5cc13dcd5e0..c32e213a439 100644 --- a/usr.bin/ssh/ttymodes.c +++ b/usr.bin/ssh/ttymodes.c @@ -43,7 +43,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ttymodes.c,v 1.18 2002/06/19 00:27:55 deraadt Exp $"); +RCSID("$OpenBSD: ttymodes.c,v 1.19 2003/04/08 20:21:29 itojun Exp $"); #include "packet.h" #include "log.h" @@ -267,7 +267,7 @@ tty_make_modes(int fd, struct termios *tiop) if (tiop == NULL) { if (tcgetattr(fd, &tio) == -1) { - log("tcgetattr: %.100s", strerror(errno)); + logit("tcgetattr: %.100s", strerror(errno)); goto end; } } else @@ -341,7 +341,7 @@ tty_parse_modes(int fd, int *n_bytes_ptr) * modes, they will initially have reasonable values. */ if (tcgetattr(fd, &tio) == -1) { - log("tcgetattr: %.100s", strerror(errno)); + logit("tcgetattr: %.100s", strerror(errno)); failure = -1; } @@ -420,7 +420,7 @@ tty_parse_modes(int fd, int *n_bytes_ptr) * left in the packet; hopefully there is nothing * more coming after the mode data. */ - log("parse_tty_modes: unknown opcode %d", opcode); + logit("parse_tty_modes: unknown opcode %d", opcode); goto set; } } else { @@ -436,7 +436,7 @@ tty_parse_modes(int fd, int *n_bytes_ptr) (void) packet_get_int(); break; } else { - log("parse_tty_modes: unknown opcode %d", opcode); + logit("parse_tty_modes: unknown opcode %d", opcode); goto set; } } @@ -446,7 +446,7 @@ tty_parse_modes(int fd, int *n_bytes_ptr) set: if (*n_bytes_ptr != n_bytes) { *n_bytes_ptr = n_bytes; - log("parse_tty_modes: n_bytes_ptr != n_bytes: %d %d", + logit("parse_tty_modes: n_bytes_ptr != n_bytes: %d %d", *n_bytes_ptr, n_bytes); return; /* Don't process bytes passed */ } @@ -455,5 +455,5 @@ set: /* Set the new modes for the terminal. */ if (tcsetattr(fd, TCSANOW, &tio) == -1) - log("Setting tty modes failed: %.100s", strerror(errno)); + logit("Setting tty modes failed: %.100s", strerror(errno)); } |