- markus@cvs.openbsd.org 2012/01/25 19:40:09

     [packet.c packet.h]
     packet_read_poll() is not used anymore.

3 files changed, 5 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 2e5881af6..3fc45168e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,9 @@
    - markus@cvs.openbsd.org 2012/01/25 19:36:31
      [authfile.c]
      memleak in key_load_file(); from Jan Klemkow
+   - markus@cvs.openbsd.org 2012/01/25 19:40:09
+     [packet.c packet.h]
+     packet_read_poll() is not used anymore.
 
 20120206
  - (djm) [ssh-keygen.c] Don't fail in do_gen_all_hostkeys on platforms
diff --git a/packet.c b/packet.c
index 0d29efffd..2f85232a6 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.175 2012/01/25 19:26:43 markus Exp $ */
+/* $OpenBSD: packet.c,v 1.176 2012/01/25 19:40:09 markus Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1450,12 +1450,6 @@ packet_read_poll_seqnr(u_int32_t *seqnr_p)
         }
 }
 
-int
-packet_read_poll(void)
-{
-        return packet_read_poll_seqnr(NULL);
-}
-
 /*
  * Buffers the given amount of input characters.  This is intended to be used
  * together with packet_read_poll.
diff --git a/packet.h b/packet.h
index 90eec17a9..09ba07951 100644
--- a/packet.h
+++ b/packet.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.h,v 1.56 2011/05/06 21:14:05 djm Exp $ */
+/* $OpenBSD: packet.h,v 1.57 2012/01/25 19:40:09 markus Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -55,7 +55,6 @@ void     packet_send(void);
 
 int      packet_read(void);
 void     packet_read_expect(int type);
-int      packet_read_poll(void);
 void     packet_process_incoming(const char *buf, u_int len);
 int      packet_read_seqnr(u_int32_t *seqnr_p);
 int      packet_read_poll_seqnr(u_int32_t *seqnr_p);