- 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@

2 files changed, 11 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index ca66ddad9..5c451e20a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 $
diff --git a/ttymodes.c b/ttymodes.c
index d11d00c28..e116b1999 100644
--- a/ttymodes.c
+++ b/ttymodes.c
@@ -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; \