summaryrefslogtreecommitdiff
path: root/usr.bin/tic
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>1999-03-22 18:43:20 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>1999-03-22 18:43:20 +0000
commitf8d76e3de6abe44dd69935a356ae2d0fc6a46114 (patch)
treeab513423b430f32a22edde461d8bf1955a9dd22f /usr.bin/tic
parent655f46886f41552a538bb4b82804425dff27d156 (diff)
back out local change that should not have escaped
Diffstat (limited to 'usr.bin/tic')
-rw-r--r--usr.bin/tic/dump_entry.c4
-rw-r--r--usr.bin/tic/tic.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/tic/dump_entry.c b/usr.bin/tic/dump_entry.c
index aa10c56f361..691a5cb7f53 100644
--- a/usr.bin/tic/dump_entry.c
+++ b/usr.bin/tic/dump_entry.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dump_entry.c,v 1.6 1999/03/15 19:00:18 millert Exp $ */
+/* $OpenBSD: dump_entry.c,v 1.7 1999/03/22 18:43:19 millert Exp $ */
/****************************************************************************
* Copyright (c) 1998,1999 Free Software Foundation, Inc. *
@@ -751,7 +751,7 @@ int dump_entry(TERMTYPE *tterm, bool limited, int numbers, int (*pred)(int type,
infodump = TRUE;
}
- if (((len = fmt_entry(tterm, pred, outform == F_TERMCAP ? TRUE : FALSE, infodump, numbers)) > critlen) && limited)
+ if (((len = fmt_entry(tterm, pred, FALSE, infodump, numbers)) > critlen) && limited)
{
(void) printf("# (untranslatable capabilities removed to fit entry within %d bytes)\n",
critlen);
diff --git a/usr.bin/tic/tic.c b/usr.bin/tic/tic.c
index 914619516c6..2fff7dd670a 100644
--- a/usr.bin/tic/tic.c
+++ b/usr.bin/tic/tic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tic.c,v 1.9 1999/03/16 15:25:32 millert Exp $ */
+/* $OpenBSD: tic.c,v 1.10 1999/03/22 18:43:19 millert Exp $ */
/****************************************************************************
* Copyright (c) 1998,1999 Free Software Foundation, Inc. *
@@ -387,7 +387,7 @@ int sortmode = S_TERMINFO; /* sort_mode */
int fd;
int width = 60;
bool formatted = FALSE; /* reformat complex strings? */
-bool numbers = 0; /* format "%'char'" to/from "%{number}" */
+int numbers = 0; /* format "%'char'" to/from "%{number}" */
bool infodump = FALSE; /* running as captoinfo? */
bool capdump = FALSE; /* running as infotocap? */
bool forceresolve = FALSE; /* force resolution */