diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2001-02-28 22:58:54 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2001-02-28 22:58:54 +0000 |
| commit | bea4b7fa274c45f1b0cbf7f8e188bc39a87d2199 (patch) | |
| tree | 389b4a145b22c5988f2181fb36c68c3fd060680a /usr.bin | |
| parent | 769b7d83c358eaa4b24d2b701fa6de76d8de075b (diff) | |
ncurses-5.2-20010224
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/infocmp/infocmp.c | 6 | ||||
| -rw-r--r-- | usr.bin/tset/tset.c | 14 |
2 files changed, 9 insertions, 11 deletions
diff --git a/usr.bin/infocmp/infocmp.c b/usr.bin/infocmp/infocmp.c index e4263156b2f..93c1f055073 100644 --- a/usr.bin/infocmp/infocmp.c +++ b/usr.bin/infocmp/infocmp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: infocmp.c,v 1.12 2001/01/22 18:02:18 millert Exp $ */ +/* $OpenBSD: infocmp.c,v 1.13 2001/02/28 22:58:52 millert Exp $ */ /**************************************************************************** * Copyright (c) 1998,1999,2000 Free Software Foundation, Inc. * @@ -43,7 +43,7 @@ #include <term_entry.h> #include <dump_entry.h> -MODULE_ID("$From: infocmp.c,v 1.59 2000/11/05 00:22:07 tom Exp $") +MODULE_ID("$From: infocmp.c,v 1.60 2001/02/24 22:03:12 tom Exp $") #define L_CURL "{" #define R_CURL "}" @@ -712,7 +712,6 @@ file_comparison(int argc, char *argv[]) /* someday we may allow comparisons on more files */ int filecount = 0; ENTRY *heads[MAXCOMPARE]; - ENTRY *tails[MAXCOMPARE]; ENTRY *qp, *rp; int i, n; @@ -746,7 +745,6 @@ file_comparison(int argc, char *argv[]) } heads[filecount] = _nc_head; - tails[filecount] = _nc_tail; filecount++; } diff --git a/usr.bin/tset/tset.c b/usr.bin/tset/tset.c index 413af8e8f40..018a5d235df 100644 --- a/usr.bin/tset/tset.c +++ b/usr.bin/tset/tset.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tset.c,v 1.22 2001/01/29 01:58:24 niklas Exp $ */ +/* $OpenBSD: tset.c,v 1.23 2001/02/28 22:58:52 millert Exp $ */ /**************************************************************************** * Copyright (c) 1998,1999,2000 Free Software Foundation, Inc. * @@ -105,7 +105,7 @@ char *ttyname(int fd); #include <dump_entry.h> #include <transform.h> -MODULE_ID("$From: tset.c,v 0.48 2000/11/04 22:50:15 tom Exp $") +MODULE_ID("$From: tset.c,v 0.49 2001/02/24 23:29:33 tom Exp $") extern char **environ; @@ -161,14 +161,14 @@ failed(const char *msg) static void cat(char *file) { - register int fd, nr, nw; + register int fd, nr; char buf[BUFSIZ]; if ((fd = open(file, O_RDONLY, 0)) < 0) failed(file); while ((nr = read(fd, buf, sizeof(buf))) > 0) - if ((nw = write(STDERR_FILENO, buf, (size_t) nr)) == -1) + if (write(STDERR_FILENO, buf, (size_t) nr) == -1) failed("write to stderr"); if (nr != 0) failed(file); @@ -497,7 +497,7 @@ mapped(const char *type) static const char * get_termcap_entry(char *userarg) { - int rval, errret; + int errret; char *p; const char *ttype; #if HAVE_GETTTYNAM @@ -590,8 +590,8 @@ get_termcap_entry(char *userarg) ttype = askuser(0); } /* Find the terminfo entry. If it doesn't exist, ask the user. */ - while ((rval = setupterm((NCURSES_CONST char *) ttype, STDOUT_FILENO, - &errret)) != OK) { + while (setupterm((NCURSES_CONST char *) ttype, STDOUT_FILENO, &errret) + != OK) { if (errret == 0) { (void) fprintf(stderr, "tset: unknown terminal type %s\n", ttype); |