===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/dispatch.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- src/usr.bin/ssh/dispatch.c	2017/05/30 14:23:52	1.30
+++ src/usr.bin/ssh/dispatch.c	2017/05/31 07:00:13	1.31
@@ -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.
  *
@@ -83,8 +83,7 @@
 }
 
 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;
@@ -109,8 +108,7 @@
 				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 {
@@ -126,11 +124,10 @@
 }
 
 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);
 }