commit 7eb039cfdfb21c74b51e97db80ffe45b1bd703a6
parent d2c4b273dc78dce3c504e8508baf24eaf6da080e
Author: Kyle Milz <krwmilz@gmail.com>
Date: Tue, 7 Sep 2021 16:33:51 +0000
replace xdvi_exit() with exit()
Diffstat:
6 files changed, 7 insertions(+), 20 deletions(-)
diff --git a/dvi-draw.c b/dvi-draw.c
@@ -265,7 +265,7 @@ tell_oops(const char *message, ...)
Fprintf(stderr, " in virtual font %s\n", currinf.virtual->fontname);
else
Fprintf(stderr, ", offset %ld\n", xtell(currinf.pos - 1));
- xdvi_exit(1);
+ exit(1);
}
diff --git a/events.c b/events.c
@@ -2430,14 +2430,14 @@ do_sigterm()
all_killed = False;
if (all_killed) /* if all processes killed */
- xdvi_exit(0);
+ exit(0);
ev_flags |= EV_TERM; /* otherwise, let the caller handle it */
}
/*
* Set the flag so that termination occurs, via the above routine.
- * This should be used in place of xdvi_exit() when there may be a
+ * This should be used in place of exit() when there may be a
* non-killable process running (e.g., anytime within read_events()).
*/
@@ -2745,7 +2745,7 @@ do_pages()
redraw_page();
}
- xdvi_exit(0);
+ exit(0);
}
else
for (;;) { /* normal operation */
diff --git a/font-open.c b/font-open.c
@@ -2104,7 +2104,7 @@ makefont(font, dpi, name, magstepval)
}
}
if (ev_flags & EV_GE_TERM)
- xdvi_exit(0);
+ exit(0);
clear_io(&mkpk_result);
(void) close(pipefds[0]);
++n_files_left;
diff --git a/util.c b/util.c
@@ -41,18 +41,6 @@ NOTE:
* General utility routines.
*/
-
-/*
- * This routine should be used for all exits, except for really early ones.
- */
-
-void
-xdvi_exit(status)
- int status;
-{
- exit(status);
-}
-
/*
* Print error message and quit.
*/
@@ -67,7 +55,7 @@ oops(const char *message, ...)
(void) vfprintf(stderr, message, args);
va_end(args);
Putc('\n', stderr);
- xdvi_exit(1);
+ exit(1);
}
diff --git a/xdvi.c b/xdvi.c
@@ -1381,7 +1381,7 @@ or: a specification `WIDTHxHEIGHT' followed by a dimension unit\n\
(pt, pc, in, bp, cm, mm, dd, cc, or sp).\n\n\
Either of the above may be preceded by a plus sign (`+'); this causes the\n\
argument is to override any papersize specials in the dvi file.\n\n", stderr);
- xdvi_exit(1);
+ exit(1);
}
for (i = 0; i < 5; ++i)
if (resource.mg_arg[i] != NULL) {
diff --git a/xdvi.h b/xdvi.h
@@ -814,7 +814,6 @@ extern void set_fg_color(const struct rgb *);
extern void applicationDoSpecial(char *);
extern void scan_special(char *);
extern void geom_do_special(struct geom_info *, char *, double);
-extern void xdvi_exit(int) NORETURN;
extern void oops(const char *, ...) NORETURN;
#ifndef KPATHSEA
extern void *xmalloc(unsigned);