diff options
author | Damien Miller <djm@mindrot.org> | 2012-02-11 08:19:21 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2012-02-11 08:19:21 +1100 |
commit | 72de982def3ee6263922d315c7c743c97f600e6c (patch) | |
tree | 25b8c5e5ac34020e2d6e859a6c2ec049d25a544c | |
parent | 5d0077008f6b9ff00dac01e2265cbfe67d4fe1d0 (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-- | ChangeLog | 3 | ||||
-rw-r--r-- | packet.c | 8 | ||||
-rw-r--r-- | packet.h | 3 |
3 files changed, 5 insertions, 9 deletions
@@ -27,6 +27,9 @@ | |||
27 | - markus@cvs.openbsd.org 2012/01/25 19:36:31 | 27 | - markus@cvs.openbsd.org 2012/01/25 19:36:31 |
28 | [authfile.c] | 28 | [authfile.c] |
29 | memleak in key_load_file(); from Jan Klemkow | 29 | memleak in key_load_file(); from Jan Klemkow |
30 | - markus@cvs.openbsd.org 2012/01/25 19:40:09 | ||
31 | [packet.c packet.h] | ||
32 | packet_read_poll() is not used anymore. | ||
30 | 33 | ||
31 | 20120206 | 34 | 20120206 |
32 | - (djm) [ssh-keygen.c] Don't fail in do_gen_all_hostkeys on platforms | 35 | - (djm) [ssh-keygen.c] Don't fail in do_gen_all_hostkeys on platforms |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: packet.c,v 1.175 2012/01/25 19:26:43 markus Exp $ */ | 1 | /* $OpenBSD: packet.c,v 1.176 2012/01/25 19:40:09 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -1450,12 +1450,6 @@ packet_read_poll_seqnr(u_int32_t *seqnr_p) | |||
1450 | } | 1450 | } |
1451 | } | 1451 | } |
1452 | 1452 | ||
1453 | int | ||
1454 | packet_read_poll(void) | ||
1455 | { | ||
1456 | return packet_read_poll_seqnr(NULL); | ||
1457 | } | ||
1458 | |||
1459 | /* | 1453 | /* |
1460 | * Buffers the given amount of input characters. This is intended to be used | 1454 | * Buffers the given amount of input characters. This is intended to be used |
1461 | * together with packet_read_poll. | 1455 | * together with packet_read_poll. |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: packet.h,v 1.56 2011/05/06 21:14:05 djm Exp $ */ | 1 | /* $OpenBSD: packet.h,v 1.57 2012/01/25 19:40:09 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -55,7 +55,6 @@ void packet_send(void); | |||
55 | 55 | ||
56 | int packet_read(void); | 56 | int packet_read(void); |
57 | void packet_read_expect(int type); | 57 | void packet_read_expect(int type); |
58 | int packet_read_poll(void); | ||
59 | void packet_process_incoming(const char *buf, u_int len); | 58 | void packet_process_incoming(const char *buf, u_int len); |
60 | int packet_read_seqnr(u_int32_t *seqnr_p); | 59 | int packet_read_seqnr(u_int32_t *seqnr_p); |
61 | int packet_read_poll_seqnr(u_int32_t *seqnr_p); | 60 | int packet_read_poll_seqnr(u_int32_t *seqnr_p); |