diff options
| author | Damien Miller <djm@mindrot.org> | 2008-07-11 17:34:35 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2008-07-11 17:34:35 +1000 |
| commit | 2f7faf19d55b8b0f591f86f1c0bd35f527c4b351 (patch) | |
| tree | 481b3db161277908e29b20ab83ac2e87eccc07d5 | |
| parent | 73193b369333e9c2409aeef6caa9f4cefa8118a1 (diff) | |
| download | openssh-git-2f7faf19d55b8b0f591f86f1c0bd35f527c4b351.tar.gz | |
- stevesk@cvs.openbsd.org 2008/07/07 00:31:41
[ttymodes.c]
we don't need arg after the debug3() was removed. from lint.
ok djm@
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ttymodes.c | 6 |
2 files changed, 11 insertions, 4 deletions
@@ -1,3 +1,10 @@ +20080711 + - (djm) OpenBSD CVS Sync + - stevesk@cvs.openbsd.org 2008/07/07 00:31:41 + [ttymodes.c] + we don't need arg after the debug3() was removed. from lint. + ok djm@ + 20080709 - (djm) [Makefile.in] Print "all tests passed" when all regress tests pass - (djm) [auth1.c] Fix format string vulnerability in protocol 1 PAM @@ -4603,4 +4610,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.5069 2008/07/09 11:07:19 djm Exp $ +$Id: ChangeLog,v 1.5070 2008/07/11 07:34:35 djm Exp $ @@ -1,4 +1,4 @@ -/* $OpenBSD: ttymodes.c,v 1.27 2008/05/19 15:45:07 djm Exp $ */ +/* $OpenBSD: ttymodes.c,v 1.28 2008/07/07 00:31:41 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -355,7 +355,7 @@ tty_parse_modes(int fd, int *n_bytes_ptr) int n_bytes = 0; int failure = 0; u_int (*get_arg)(void); - int arg, arg_size; + int arg_size; if (compat20) { *n_bytes_ptr = packet_get_int(); @@ -416,7 +416,7 @@ tty_parse_modes(int fd, int *n_bytes_ptr) #define TTYMODE(NAME, FIELD, OP) \ case OP: \ n_bytes += arg_size; \ - if ((arg = get_arg())) \ + if (get_arg()) \ tio.FIELD |= NAME; \ else \ tio.FIELD &= ~NAME; \ |