summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorPeter Valchev <pvalchev@cvs.openbsd.org>2001-07-16 06:14:32 +0000
committerPeter Valchev <pvalchev@cvs.openbsd.org>2001-07-16 06:14:32 +0000
commite43f28fe697b759e0f67c428fb7400874b7b4ebb (patch)
tree179ec4e75832071a9a07cadf569e68991323954c /usr.bin
parent313908944da515066f5fca30c25f791392b70007 (diff)
-Wall cleanup; ok millert
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/tset/termcap.c8
-rw-r--r--usr.bin/tset/tset.c4
2 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/tset/termcap.c b/usr.bin/tset/termcap.c
index 47aa953eeaa..aa9a8ed677b 100644
--- a/usr.bin/tset/termcap.c
+++ b/usr.bin/tset/termcap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: termcap.c,v 1.2 2000/08/02 04:10:50 millert Exp $ */
+/* $OpenBSD: termcap.c,v 1.3 2001/07/16 06:14:31 pvalchev Exp $ */
/* $NetBSD: termcap.c,v 1.7 1995/06/05 19:45:52 pk Exp $ */
/*
@@ -35,7 +35,7 @@
*/
#ifndef lint
-static char rcsid[] = "$OpenBSD: termcap.c,v 1.2 2000/08/02 04:10:50 millert Exp $";
+static char rcsid[] = "$OpenBSD: termcap.c,v 1.3 2001/07/16 06:14:31 pvalchev Exp $";
#endif /* not lint */
#define PVECSIZ 32 /* max number of names in path */
@@ -45,6 +45,7 @@ static char rcsid[] = "$OpenBSD: termcap.c,v 1.2 2000/08/02 04:10:50 millert Exp
#include <sys/types.h>
#include <stdio.h>
#include <ctype.h>
+#include <err.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
@@ -67,7 +68,6 @@ tcgetent(bp, name)
char *pathvec[PVECSIZ]; /* to point to names in pathbuf */
char **pvec; /* holds usable tail of path vector */
char *termpath;
- char *ttype;
fname = pathvec;
pvec = pathvec;
@@ -162,7 +162,7 @@ wrtermcap(bp)
/* Find the end of the terminal names. */
if ((t = strchr(bp, ':')) == NULL)
- err("termcap names not colon terminated");
+ err(1, "termcap names not colon terminated");
*t++ = '\0';
/* Output terminal names that don't have whitespace. */
diff --git a/usr.bin/tset/tset.c b/usr.bin/tset/tset.c
index 018a5d235df..393f99bfbc4 100644
--- a/usr.bin/tset/tset.c
+++ b/usr.bin/tset/tset.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tset.c,v 1.23 2001/02/28 22:58:52 millert Exp $ */
+/* $OpenBSD: tset.c,v 1.24 2001/07/16 06:14:31 pvalchev Exp $ */
/****************************************************************************
* Copyright (c) 1998,1999,2000 Free Software Foundation, Inc. *
@@ -90,7 +90,7 @@ char *ttyname(int fd);
#endif
/* this is just to stifle a missing-prototype warning */
-#ifdef linux
+#if defined(linux) || defined(__OpenBSD__)
# include <sys/ioctl.h>
#endif