wdvi

commit 4807dc4c0a794ce66c6cd125745fb9bc1ae12eff
parent a9cbbb6004f5675d1c974a4909da96fe4ba452a3
Author: Kyle Milz <krwmilz@gmail.com>
Date:   Thu,  9 Sep 2021 20:24:12 +0000

oops, should have been with last commit

Diffstat:
M
font-open.c
 | 
17
-----------------

1 file changed, 0 insertions(+), 17 deletions(-)
diff --git a/font-open.c b/font-open.c
@@ -1695,17 +1695,6 @@ mkpk_term(status)
 }
 
 static	struct xchild	mkpk_child	= {NULL, 0, False, mkpk_term};
-static	Boolean		mkpk_timer_set;
-
-static	void
-mkpk_alarm(arg)
-	struct xtimer	*arg;
-{
-	mkpk_timer_set = False;
-	ev_flags |= EV_ACK;
-}
-
-static	struct xtimer	mkpk_timer	= TIMER_INIT(mkpk_alarm);
 
 /*
  *	Stuff to handle child process output
@@ -1991,22 +1980,16 @@ makefont(font, dpi, name, magstepval)
 
 	    if (ev_flags & EV_GE_NEWDOC) {	/* if we're aborting */
 		kill(-mkpk_child.pid, SIGINT);
-		set_timer(&mkpk_timer, 3000);
-		mkpk_timer_set = True;
 		for (;;) {
 		    (void) read_events(EV_ACK);
 		    ev_flags &= ~EV_ACK;
 
 		    if (mkpk_done) {
-			if (mkpk_timer_set)
-			    cancel_timer(&mkpk_timer);
 			break;
 		    }
-		    if (!mkpk_timer_set) {
 			kill(-mkpk_child.pid, SIGKILL);
 			clear_chld(&mkpk_child);
 			break;
-		    }
 		}
 		if (ev_flags & EV_GE_TERM)
 		    exit(0);