diff options
Diffstat (limited to 'ncurses/tinfo/make_keys.c')
| -rw-r--r-- | ncurses/tinfo/make_keys.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/ncurses/tinfo/make_keys.c b/ncurses/tinfo/make_keys.c index a7854e3fe604..c084f87fb943 100644 --- a/ncurses/tinfo/make_keys.c +++ b/ncurses/tinfo/make_keys.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2008,2010 Free Software Foundation, Inc. * + * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -37,18 +37,18 @@ */ #define USE_TERMLIB 1 -#include <build.priv.h> +#include <curses.priv.h> -MODULE_ID("$Id: make_keys.c,v 1.19 2010/06/05 22:08:00 tom Exp $") +MODULE_ID("$Id: make_keys.c,v 1.14 2008/08/03 21:57:22 tom Exp $") #include <names.c> -#define UNKNOWN (unsigned) (SIZEOF(strnames) + SIZEOF(strfnames)) +#define UNKNOWN (SIZEOF(strnames) + SIZEOF(strfnames)) -static unsigned +static size_t lookup(const char *name) { - unsigned n; + size_t n; bool found = FALSE; for (n = 0; strnames[n] != 0; n++) { if (!strcmp(name, strnames[n])) { @@ -73,7 +73,7 @@ make_keys(FILE *ifp, FILE *ofp) char buffer[BUFSIZ]; char from[256]; char to[256]; - unsigned maxlen = 16; + int maxlen = 16; int scanned; while (fgets(buffer, sizeof(buffer), ifp) != 0) { @@ -85,14 +85,14 @@ make_keys(FILE *ifp, FILE *ofp) scanned = sscanf(buffer, "%255s %255s", to, from); if (scanned == 2) { - unsigned code = lookup(from); + int code = lookup(from); if (code == UNKNOWN) continue; - if (strlen(from) > maxlen) - maxlen = (unsigned) strlen(from); - fprintf(ofp, "\t{ %4u, %-*.*s },\t/* %s */\n", + if ((int) strlen(from) > maxlen) + maxlen = strlen(from); + fprintf(ofp, "\t{ %4d, %-*.*s },\t/* %s */\n", code, - (int) maxlen, (int) maxlen, + maxlen, maxlen, to, from); } |