diff options
author | markus@openbsd.org <markus@openbsd.org> | 2017-05-31 07:00:13 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-06-01 14:53:33 +1000 |
commit | 92e9fe633130376a95dd533df6e5e6a578c1e6b8 (patch) | |
tree | c6f037e447c3c6fe4d79a71fb5a14f712f739617 /dispatch.c | |
parent | 17ad5b346043c5bbc5befa864d0dbeb76be39390 (diff) |
upstream commit
remove now obsolete ctx from ssh_dispatch_run; ok djm@
Upstream-ID: 9870aabf7f4d71660c31fda91b942b19a8e68d29
Diffstat (limited to 'dispatch.c')
-rw-r--r-- | dispatch.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/dispatch.c b/dispatch.c index 5b2fc41ca..0b3ea614e 100644 --- a/dispatch.c +++ b/dispatch.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: dispatch.c,v 1.30 2017/05/30 14:23:52 markus Exp $ */ | 1 | /* $OpenBSD: dispatch.c,v 1.31 2017/05/31 07:00:13 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -85,8 +85,7 @@ ssh_dispatch_set(struct ssh *ssh, int type, dispatch_fn *fn) | |||
85 | } | 85 | } |
86 | 86 | ||
87 | int | 87 | int |
88 | ssh_dispatch_run(struct ssh *ssh, int mode, volatile sig_atomic_t *done, | 88 | ssh_dispatch_run(struct ssh *ssh, int mode, volatile sig_atomic_t *done) |
89 | void *ctxt) | ||
90 | { | 89 | { |
91 | int r; | 90 | int r; |
92 | u_char type; | 91 | u_char type; |
@@ -111,8 +110,7 @@ ssh_dispatch_run(struct ssh *ssh, int mode, volatile sig_atomic_t *done, | |||
111 | ssh->dispatch_skip_packets--; | 110 | ssh->dispatch_skip_packets--; |
112 | continue; | 111 | continue; |
113 | } | 112 | } |
114 | /* XXX 'ssh' will replace 'ctxt' later */ | 113 | r = (*ssh->dispatch[type])(type, seqnr, ssh); |
115 | r = (*ssh->dispatch[type])(type, seqnr, ctxt); | ||
116 | if (r != 0) | 114 | if (r != 0) |
117 | return r; | 115 | return r; |
118 | } else { | 116 | } else { |
@@ -128,11 +126,10 @@ ssh_dispatch_run(struct ssh *ssh, int mode, volatile sig_atomic_t *done, | |||
128 | } | 126 | } |
129 | 127 | ||
130 | void | 128 | void |
131 | ssh_dispatch_run_fatal(struct ssh *ssh, int mode, volatile sig_atomic_t *done, | 129 | ssh_dispatch_run_fatal(struct ssh *ssh, int mode, volatile sig_atomic_t *done) |
132 | void *ctxt) | ||
133 | { | 130 | { |
134 | int r; | 131 | int r; |
135 | 132 | ||
136 | if ((r = ssh_dispatch_run(ssh, mode, done, ctxt)) != 0) | 133 | if ((r = ssh_dispatch_run(ssh, mode, done)) != 0) |
137 | sshpkt_fatal(ssh, __func__, r); | 134 | sshpkt_fatal(ssh, __func__, r); |
138 | } | 135 | } |