upstream commit

remove now obsolete ctx from ssh_dispatch_run; ok djm@

Upstream-ID: 9870aabf7f4d71660c31fda91b942b19a8e68d29

1 files changed, 3 insertions, 5 deletions

diff --git a/dispatch.h b/dispatch.h
index 7dfc74ee3..17a6f3db6 100644
--- a/dispatch.h
+++ b/dispatch.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dispatch.h,v 1.13 2017/05/30 14:23:52 markus Exp $ */
+/* $OpenBSD: dispatch.h,v 1.14 2017/05/31 07:00:13 markus Exp $ */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -43,8 +43,8 @@ int	dispatch_protocol_ignore(int, u_int32_t, struct ssh *);
 void    ssh_dispatch_init(struct ssh *, dispatch_fn *);
 void    ssh_dispatch_set(struct ssh *, int, dispatch_fn *);
 void    ssh_dispatch_range(struct ssh *, u_int, u_int, dispatch_fn *);
-int     ssh_dispatch_run(struct ssh *, int, volatile sig_atomic_t *, void *);
-void    ssh_dispatch_run_fatal(struct ssh *, int, volatile sig_atomic_t *, void *);
+int     ssh_dispatch_run(struct ssh *, int, volatile sig_atomic_t *);
+void    ssh_dispatch_run_fatal(struct ssh *, int, volatile sig_atomic_t *);
 
 #define dispatch_init(dflt) \
         ssh_dispatch_init(active_state, (dflt))
@@ -52,7 +52,5 @@ void	ssh_dispatch_run_fatal(struct ssh *, int, volatile sig_atomic_t *, void *);
         ssh_dispatch_range(active_state, (from), (to), (fn))
 #define dispatch_set(type, fn) \
         ssh_dispatch_set(active_state, (type), (fn))
-#define dispatch_run(mode, done, ctxt) \
-        ssh_dispatch_run_fatal(active_state, (mode), (done), (ctxt))
 
 #endif