ncurses 6.0 - patch 20151017

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

diff --git a/ncurses/widechar/lib_unget_wch.c b/ncurses/widechar/lib_unget_wch.c
index d17e618ccf47fc9ad9660f1d09c83475cc8f7986..d5ae608e36eda4ce2e5831c6189072a13a552d69 100644 (file)
--- a/ncurses/widechar/lib_unget_wch.c
+++ b/ncurses/widechar/lib_unget_wch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2002-2008,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 2002-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            *
@@ -39,7 +39,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_unget_wch.c,v 1.12 2009/10/10 20:01:13 tom Exp $")
+MODULE_ID("$Id: lib_unget_wch.c,v 1.15 2011/10/22 16:34:50 tom Exp $")
 
 /*
  * Wrapper for wcrtomb() which obtains the length needed for the given
@@ -55,13 +55,13 @@ _nc_wcrtomb(char *target, wchar_t source, mbstate_t * state)
        const wchar_t *tempp = temp;
        temp[0] = source;
        temp[1] = 0;
-       result = wcsrtombs(NULL, &tempp, 0, state);
+       result = (int) wcsrtombs(NULL, &tempp, (size_t) 0, state);
     } else {
-       result = wcrtomb(target, source, state);
+       result = (int) wcrtomb(target, source, state);
     }
     if (!isEILSEQ(result) && (result == 0))
        result = 1;
-    return result;
+    return (size_t) result;
 }
 
 NCURSES_EXPORT(int)
@@ -72,7 +72,7 @@ NCURSES_SP_NAME(unget_wch) (NCURSES_SP_DCLx const wchar_t wch)
     size_t length;
     int n;
 
-    T((T_CALLED("unget_wch(%p, %#lx)"), SP_PARM, (unsigned long) wch));
+    T((T_CALLED("unget_wch(%p, %#lx)"), (void *) SP_PARM, (unsigned long) wch));
 
     init_mb(state);
     length = _nc_wcrtomb(0, wch, &state);
@@ -83,10 +83,12 @@ NCURSES_SP_NAME(unget_wch) (NCURSES_SP_DCLx const wchar_t wch)
 
        if ((string = (char *) malloc(length)) != 0) {
            init_mb(state);
-           wcrtomb(string, wch, &state);
+           /* ignore the result, since we already validated the character */
+           IGNORE_RC((int) wcrtomb(string, wch, &state));
 
            for (n = (int) (length - 1); n >= 0; --n) {
-               if (NCURSES_SP_NAME(ungetch) (NCURSES_SP_ARGx UChar(string[n])) != OK) {
+               if (NCURSES_SP_NAME(ungetch) (NCURSES_SP_ARGx
+                                             UChar(string[n])) !=OK) {
                    result = ERR;
                    break;
                }