Imported Upstream version 4.1.0~20120320gitdb59704upstream/4.1.0_20120320gitdb59704

1 files changed, 1 insertions, 3 deletions

diff --git a/display.c b/display.c
index 5fa11cb..94c05f1 100644
--- a/display.c
+++ b/display.c
@@ -51,7 +51,6 @@ static void disp_writeev_eagain __P((struct event *, char *));
 static void disp_status_fn __P((struct event *, char *));
 static void disp_hstatus_fn __P((struct event *, char *));
 static void disp_blocked_fn __P((struct event *, char *));
-static void cv_winid_fn __P((struct event *, char *));
 #ifdef MAPKEYS
 static void disp_map_fn __P((struct event *, char *));
 #endif
@@ -2123,7 +2122,6 @@ static int
 strlen_onscreen(unsigned char *c, unsigned char *end)
 {
   int len = 0;
-  char *s = c;
   while (*c && (!end || c < end))
     {
       int v, dec = 0;
@@ -2155,7 +2153,7 @@ int start, max;
      probably take way more time. So this will have to do for now. */
   if (D_encoding == UTF8)
     {
-      int chars = strlen_onscreen(s + start, s + max);
+      int chars = strlen_onscreen((unsigned char *)(s + start), (unsigned char *)(s + max));
       D_encoding = 0;
       PutWinMsg(s, start, max);
       D_encoding = UTF8;