summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2012-02-11 08:19:21 +1100
committerDamien Miller <djm@mindrot.org>2012-02-11 08:19:21 +1100
commit72de982def3ee6263922d315c7c743c97f600e6c (patch)
tree25b8c5e5ac34020e2d6e859a6c2ec049d25a544c
parent5d0077008f6b9ff00dac01e2265cbfe67d4fe1d0 (diff)
- markus@cvs.openbsd.org 2012/01/25 19:40:09
[packet.c packet.h] packet_read_poll() is not used anymore.
-rw-r--r--ChangeLog3
-rw-r--r--packet.c8
-rw-r--r--packet.h3
3 files changed, 5 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 2e5881af..3fc45168 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 0d29efff..2f85232a 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 90eec17a..09ba0795 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);