[src/trunk]: src/lib/libedit fix warnings on ubuntu 32 bit (Miki Rozloznik)

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f882b1a2019d
branches:  trunk
changeset: 338203:f882b1a2019d
user:      christos <christos%NetBSD.org@localhost>
date:      Thu May 14 10:44:15 2015 +0000

description:
fix warnings on ubuntu 32 bit (Miki Rozloznik)

diffstat:

 lib/libedit/chartype.h |  4 +++-
 lib/libedit/map.c      |  8 ++++----
 lib/libedit/tty.c      |  8 ++++----
 3 files changed, 11 insertions(+), 9 deletions(-)

diffs (83 lines):

diff -r d3054823216c -r f882b1a2019d lib/libedit/chartype.h
--- a/lib/libedit/chartype.h    Thu May 14 10:23:03 2015 +0000
+++ b/lib/libedit/chartype.h    Thu May 14 10:44:15 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: chartype.h,v 1.13 2015/02/22 02:16:19 christos Exp $   */
+/*     $NetBSD: chartype.h,v 1.14 2015/05/14 10:44:15 christos Exp $   */
 
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -72,6 +72,7 @@
 #define FUN(prefix,rest)       prefix ## _w ## rest
 #define FUNW(type)             type ## _w
 #define TYPE(type)             type ## W
+#define FCHAR                  "%lc"
 #define FSTR                   "%ls"
 #define STR(x)                         L ## x
 #define UC(c)                  c
@@ -126,6 +127,7 @@
 #define FUN(prefix,rest)       prefix ## _ ## rest
 #define FUNW(type)             type
 #define TYPE(type)             type
+#define FCHAR                  "%c"
 #define FSTR                   "%s"
 #define STR(x)                         x
 #define UC(c)                  (unsigned char)(c)
diff -r d3054823216c -r f882b1a2019d lib/libedit/map.c
--- a/lib/libedit/map.c Thu May 14 10:23:03 2015 +0000
+++ b/lib/libedit/map.c Thu May 14 10:44:15 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: map.c,v 1.34 2014/07/06 18:15:34 christos Exp $        */
+/*     $NetBSD: map.c,v 1.35 2015/05/14 10:44:15 christos Exp $        */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)map.c      8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: map.c,v 1.34 2014/07/06 18:15:34 christos Exp $");
+__RCSID("$NetBSD: map.c,v 1.35 2015/05/14 10:44:15 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -1300,8 +1300,8 @@
                                return 0;
                        default:
                                (void) fprintf(el->el_errfile,
-                                   "" FSTR ": Invalid switch `%c'.\n",
-                                   argv[0], p[1]);
+                                   "" FSTR ": Invalid switch `" FCHAR "'.\n",
+                                   argv[0], (Int)p[1]);
                        }
                else
                        break;
diff -r d3054823216c -r f882b1a2019d lib/libedit/tty.c
--- a/lib/libedit/tty.c Thu May 14 10:23:03 2015 +0000
+++ b/lib/libedit/tty.c Thu May 14 10:44:15 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tty.c,v 1.46 2014/06/18 18:52:49 christos Exp $        */
+/*     $NetBSD: tty.c,v 1.47 2015/05/14 10:44:15 christos Exp $        */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)tty.c      8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: tty.c,v 1.46 2014/06/18 18:52:49 christos Exp $");
+__RCSID("$NetBSD: tty.c,v 1.47 2015/05/14 10:44:15 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -1171,8 +1171,8 @@
                        break;
                default:
                        (void) fprintf(el->el_errfile,
-                           "%s: Unknown switch `%c'.\n",
-                           name, argv[0][1]);
+                           "%s: Unknown switch `" FCHAR "'.\n",
+                           name, (Int)argv[0][1]);
                        return -1;
                }