ncurses 5.9 - patch 20111022

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

diff --git a/ncurses/tinfo/make_keys.c b/ncurses/tinfo/make_keys.c
index 8eb4a9afc6a5928d423b32c18933987c138b44a6..f44f7c77ff7e3d6762a7566db65b624dec4075d4 100644 (file)
--- a/ncurses/tinfo/make_keys.c
+++ b/ncurses/tinfo/make_keys.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2010,2011 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,13 +37,13 @@
  */
 
 #define USE_TERMLIB 1
-#include <curses.priv.h>
+#include <build.priv.h>
 
-MODULE_ID("$Id: make_keys.c,v 1.15 2008/11/16 00:19:59 juergen Exp $")
+MODULE_ID("$Id: make_keys.c,v 1.20 2011/10/22 16:34:50 tom Exp $")
 
 #include <names.c>
 
-#define UNKNOWN (SIZEOF(strnames) + SIZEOF(strfnames))
+#define UNKNOWN (unsigned) (SIZEOF(strnames) + SIZEOF(strfnames))
 
 static unsigned
 lookup(const char *name)
@@ -76,7 +76,7 @@ make_keys(FILE *ifp, FILE *ofp)
     unsigned maxlen = 16;
     int scanned;
 
-    while (fgets(buffer, sizeof(buffer), ifp) != 0) {
+    while (fgets(buffer, (int) sizeof(buffer), ifp) != 0) {
        if (*buffer == '#')
            continue;
 
@@ -89,10 +89,10 @@ make_keys(FILE *ifp, FILE *ofp)
            if (code == UNKNOWN)
                continue;
            if (strlen(from) > maxlen)
-               maxlen = strlen(from);
-           fprintf(ofp, "\t{ %4d, %-*.*s },\t/* %s */\n",
+               maxlen = (unsigned) strlen(from);
+           fprintf(ofp, "\t{ %4u, %-*.*s },\t/* %s */\n",
                    code,
-                   maxlen, maxlen,
+                   (int) maxlen, (int) maxlen,
                    to,
                    from);
        }