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) | |
| download | openssh-git-92e9fe633130376a95dd533df6e5e6a578c1e6b8.tar.gz | |
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
@@ -1,4 +1,4 @@ -/* $OpenBSD: dispatch.c,v 1.30 2017/05/30 14:23:52 markus Exp $ */ +/* $OpenBSD: dispatch.c,v 1.31 2017/05/31 07:00:13 markus Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -85,8 +85,7 @@ ssh_dispatch_set(struct ssh *ssh, int type, dispatch_fn *fn) } int -ssh_dispatch_run(struct ssh *ssh, int mode, volatile sig_atomic_t *done, - void *ctxt) +ssh_dispatch_run(struct ssh *ssh, int mode, volatile sig_atomic_t *done) { int r; u_char type; @@ -111,8 +110,7 @@ ssh_dispatch_run(struct ssh *ssh, int mode, volatile sig_atomic_t *done, ssh->dispatch_skip_packets--; continue; } - /* XXX 'ssh' will replace 'ctxt' later */ - r = (*ssh->dispatch[type])(type, seqnr, ctxt); + r = (*ssh->dispatch[type])(type, seqnr, ssh); if (r != 0) return r; } else { @@ -128,11 +126,10 @@ ssh_dispatch_run(struct ssh *ssh, int mode, volatile sig_atomic_t *done, } void -ssh_dispatch_run_fatal(struct ssh *ssh, int mode, volatile sig_atomic_t *done, - void *ctxt) +ssh_dispatch_run_fatal(struct ssh *ssh, int mode, volatile sig_atomic_t *done) { int r; - if ((r = ssh_dispatch_run(ssh, mode, done, ctxt)) != 0) + if ((r = ssh_dispatch_run(ssh, mode, done)) != 0) sshpkt_fatal(ssh, __func__, r); } |