ncurses 5.7 - patch 20100424

[ncurses.git] / ncurses / tinfo / make_keys.c

diff --git a/ncurses/tinfo/make_keys.c b/ncurses/tinfo/make_keys.c
index c084f87fb94375774cb1fdb4cac9497c2f9fe94b..dc8ebd03f6af893d3bc3bbb42c62ca1176da13ea 100644 (file)
--- a/ncurses/tinfo/make_keys.c
+++ b/ncurses/tinfo/make_keys.c
@@ -39,16 +39,16 @@
 #define USE_TERMLIB 1
 #include <curses.priv.h>
 
 #define USE_TERMLIB 1
 #include <curses.priv.h>
 

-MODULE_ID("$Id: make_keys.c,v 1.14 2008/08/03 21:57:22 tom Exp $")
+MODULE_ID("$Id: make_keys.c,v 1.16 2010/04/24 22:20:53 tom Exp $")

 
 #include <names.c>
 
 
 #include <names.c>
 

-#define UNKNOWN (SIZEOF(strnames) + SIZEOF(strfnames))
+#define UNKNOWN (unsigned) (SIZEOF(strnames) + SIZEOF(strfnames))

 
 

-static size_t
+static unsigned

 lookup(const char *name)
 {
 lookup(const char *name)
 {

-    size_t n;
+    unsigned n;

     bool found = FALSE;
     for (n = 0; strnames[n] != 0; n++) {
        if (!strcmp(name, strnames[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];
     char buffer[BUFSIZ];
     char from[256];
     char to[256];

-    int maxlen = 16;
+    unsigned maxlen = 16;

     int scanned;
 
     while (fgets(buffer, sizeof(buffer), ifp) != 0) {
     int scanned;
 
     while (fgets(buffer, sizeof(buffer), ifp) != 0) {


@@ -85,11 +85,11 @@ make_keys(FILE *ifp, FILE *ofp)
 
        scanned = sscanf(buffer, "%255s %255s", to, from);
        if (scanned == 2) {
 
        scanned = sscanf(buffer, "%255s %255s", to, from);
        if (scanned == 2) {

-           int code = lookup(from);
+           unsigned code = lookup(from);

            if (code == UNKNOWN)
                continue;
            if (code == UNKNOWN)
                continue;

-           if ((int) strlen(from) > maxlen)
-               maxlen = strlen(from);
+           if (strlen(from) > maxlen)
+               maxlen = (unsigned) strlen(from);

            fprintf(ofp, "\t{ %4d, %-*.*s },\t/* %s */\n",
                    code,
                    maxlen, maxlen,
            fprintf(ofp, "\t{ %4d, %-*.*s },\t/* %s */\n",
                    code,
                    maxlen, maxlen,