diff options
Diffstat (limited to 'contrib/ncurses/progs/infocmp.c')
| -rw-r--r-- | contrib/ncurses/progs/infocmp.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/contrib/ncurses/progs/infocmp.c b/contrib/ncurses/progs/infocmp.c index bf7ff1c54b07..5d1a11113493 100644 --- a/contrib/ncurses/progs/infocmp.c +++ b/contrib/ncurses/progs/infocmp.c @@ -41,7 +41,7 @@ #include <term_entry.h> #include <dump_entry.h> -MODULE_ID("$Id: infocmp.c,v 1.57 2000/10/01 01:26:25 tom Exp $") +MODULE_ID("$Id: infocmp.c,v 1.60 2001/02/24 22:03:12 tom Exp $") #define L_CURL "{" #define R_CURL "}" @@ -710,7 +710,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; @@ -744,7 +743,6 @@ file_comparison(int argc, char *argv[]) } heads[filecount] = _nc_head; - tails[filecount] = _nc_tail; filecount++; } @@ -949,7 +947,7 @@ name_initializer(const char *type) (void) sprintf(initializer, "%s_data_%s", type, entries->tterm.term_names); for (s = initializer; *s != 0 && *s != '|'; s++) { - if (!isalnum(*s)) + if (!isalnum(CharOf(*s))) *s = '_'; } *s = 0; @@ -1029,10 +1027,13 @@ dump_initializers(TERMTYPE * term) for (sp = term->Strings[n]; *sp != 0 && (tp - buf) < MAX_STRING - 6; sp++) { - if (isascii(*sp) && isprint(*sp) && *sp != '\\' && *sp != '"') + if (isascii(CharOf(*sp)) + && isprint(CharOf(*sp)) + && *sp != '\\' + && *sp != '"') *tp++ = *sp; else { - (void) sprintf(tp, "\\%03o", *sp & 0xff); + (void) sprintf(tp, "\\%03o", CharOf(*sp)); tp += 4; } } |