Split the -M event handler into the two different handlers it is.

bin/varnishd/mgt/mgt_cli.c

@@ -578,16 +578,16 @@ Marg_closer(void *priv)
 	M_fd = -1;
 }
 
-static int
-Marg_poker(const struct vev *e, int what)
+static int __match_proto__(vev_cb_f)
+Marg_connect(const struct vev *e, int what)
 {
 	struct vsb *vsb;
-	int s, k;
+	int k;
 	socklen_t l;
 
-	(void)what;	/* XXX: ??? */
+	assert(e == M_conn);
+	(void)what;
 
-	if (e == M_conn) {
 	/* Our connect(2) returned, check result */
 	l = sizeof k;
 	AZ(getsockopt(M_fd, SOL_SOCKET, SO_ERROR, &k, &l));
@@ -609,9 +609,15 @@ Marg_poker(const struct vev *e, int what)
 	VSB_delete(vsb);
 	M_poll = 1;
 	return (1);
-	}
+}
+
+static int __match_proto__(vev_cb_f)
+Marg_poker(const struct vev *e, int what)
+{
+	int s;
 
 	assert(e == M_poker);
+	(void)what;
 
 	M_poker->timeout = M_poll;	/* XXX nasty ? */
 	if (M_fd >= 0)
@@ -626,7 +632,7 @@ Marg_poker(const struct vev *e, int what)
 
 	M_conn = vev_new();
 	AN(M_conn);
-	M_conn->callback = Marg_poker;
+	M_conn->callback = Marg_connect;
 	M_conn->name = "-M connector";
 	M_conn->fd_flags = EV_WR;
 	M_conn->fd = s;