ncurses 5.9 - patch 20120310

[ncurses.git] / ncurses / widechar / lib_cchar.c

diff --git a/ncurses/widechar/lib_cchar.c b/ncurses/widechar/lib_cchar.c
index 0a1fe82f31f3b6ddb0269758106915bbe1a12b46..7fac5c505d489bc7d64f4cd45efeecd1fae57e72 100644 (file)
--- a/ncurses/widechar/lib_cchar.c
+++ b/ncurses/widechar/lib_cchar.c
@@ -35,7 +35,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_cchar.c,v 1.23 2011/07/23 21:31:51 David.Benjamin Exp $")
+MODULE_ID("$Id: lib_cchar.c,v 1.25 2012/03/10 20:52:21 tom Exp $")
 
 /* 
  * The SuSv2 description leaves some room for interpretation.  We'll assume wch
@@ -60,7 +60,7 @@ setcchar(cchar_t *wcval,
 
     if (opts != NULL
        || wch == NULL
-       || ((len = wcslen(wch)) > 1 && wcwidth(wch[0]) < 0)) {
+       || ((len = (unsigned) wcslen(wch)) > 1 && wcwidth(wch[0]) < 0)) {
        code = ERR;
     } else {
        if (len > CCHARW_MAX)
@@ -111,7 +111,7 @@ getcchar(const cchar_t *wcval,
                      opts));
 
     if (opts == NULL && wcval != NULL) {
-       len = ((wp = wmemchr(wcval->chars, L'\0', CCHARW_MAX))
+       len = ((wp = wmemchr(wcval->chars, L'\0', (size_t) CCHARW_MAX))
               ? (int) (wp - wcval->chars)
               : CCHARW_MAX);
 
@@ -126,7 +126,7 @@ getcchar(const cchar_t *wcval,
        } else if (len >= 0) {
            *attrs = AttrOf(*wcval) & A_ATTRIBUTES;
            *color_pair = (short) GetPair(*wcval);
-           wmemcpy(wch, wcval->chars, (unsigned) len);
+           wmemcpy(wch, wcval->chars, (size_t) len);
            wch[len] = L'\0';
            code = OK;
        }