summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormartijn <martijn@openbsd.org>2016-01-27 22:38:12 +0000
committermartijn <martijn@openbsd.org>2016-01-27 22:38:12 +0000
commit0b9bdb244a7cbd26b0872f2bc99d84be6b2328cb (patch)
treec7bea86af92557fb0d033a5e6ceb8348e4856fce
parentFix typo in comment. From Chris Bennett, thanks! (diff)
downloadwireguard-openbsd-0b9bdb244a7cbd26b0872f2bc99d84be6b2328cb.tar.xz
wireguard-openbsd-0b9bdb244a7cbd26b0872f2bc99d84be6b2328cb.zip
Replace fprintf+exit with errx. No functional change
OK zhuk@ and schwarze@ fine with me tb@
-rw-r--r--usr.bin/vi/cl/cl_main.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/usr.bin/vi/cl/cl_main.c b/usr.bin/vi/cl/cl_main.c
index 8cf90458502..840664f5086 100644
--- a/usr.bin/vi/cl/cl_main.c
+++ b/usr.bin/vi/cl/cl_main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cl_main.c,v 1.28 2015/12/28 19:24:01 millert Exp $ */
+/* $OpenBSD: cl_main.c,v 1.29 2016/01/27 22:38:12 martijn Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -39,7 +39,7 @@ static CL_PRIVATE *cl_init(GS *);
static GS *gs_init(char *);
static int setsig(int, struct sigaction *, void (*)(int));
static void sig_end(GS *);
-static void term_init(char *, char *);
+static void term_init(char *);
/*
* main --
@@ -73,7 +73,7 @@ main(int argc, char *argv[])
*/
if ((ttype = getenv("TERM")) == NULL)
ttype = "unknown";
- term_init(gp->progname, ttype);
+ term_init(ttype);
/* Add the terminal type to the global structure. */
if ((OG_D_STR(gp, GO_TERM) =
@@ -211,7 +211,7 @@ tcfail: err(1, "tcgetattr");
* Initialize terminal information.
*/
static void
-term_init(char *name, char *ttype)
+term_init(char *ttype)
{
int err;
@@ -219,13 +219,9 @@ term_init(char *name, char *ttype)
setupterm(ttype, STDOUT_FILENO, &err);
switch (err) {
case -1:
- (void)fprintf(stderr,
- "%s: No terminal database found\n", name);
- exit (1);
+ errx(1, "No terminal database found");
case 0:
- (void)fprintf(stderr,
- "%s: %s: unknown terminal type\n", name, ttype);
- exit (1);
+ errx(1, "%s: unknown terminal type", ttype);
}
}