X-Git-Url: https://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=ncurses%2Fwidechar%2Flib_get_wch.c;h=32033df2ff9bbd811e4658fe78f41cab2fe66528;hb=9817912d803dae0223ada5ab28c6df521800d4bb;hp=f322abb18426003e8c70d30d69e1c67c449d0572;hpb=92e187a3459ab7ce1613a3684ca6642447c73620;p=ncurses.git

diff --git a/ncurses/widechar/lib_get_wch.c b/ncurses/widechar/lib_get_wch.c
index f322abb1..32033df2 100644
--- a/ncurses/widechar/lib_get_wch.c
+++ b/ncurses/widechar/lib_get_wch.c
@@ -40,7 +40,7 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_get_wch.c,v 1.21 2010/05/01 22:04:08 tom Exp $")
+MODULE_ID("$Id: lib_get_wch.c,v 1.22 2010/08/28 21:00:35 tom Exp $")
 
 NCURSES_EXPORT(int)
 wget_wch(WINDOW *win, wint_t *result)
@@ -50,7 +50,7 @@ wget_wch(WINDOW *win, wint_t *result)
     char buffer[(MB_LEN_MAX * 9) + 1];	/* allow some redundant shifts */
     int status;
     size_t count = 0;
-    unsigned long value = 0;
+    int value = 0;
     wchar_t wch;
 #ifndef state_unused
     mbstate_t state;
@@ -80,12 +80,12 @@ wget_wch(WINDOW *win, wint_t *result)
 		 * whether the improvement would be worth the effort.
 		 */
 		if (count != 0) {
-		    safe_ungetch(SP_PARM, (int) value);
+		    safe_ungetch(SP_PARM, value);
 		    code = ERR;
 		}
 		break;
 	    } else if (count + 1 >= sizeof(buffer)) {
-		safe_ungetch(SP_PARM, (int) value);
+		safe_ungetch(SP_PARM, value);
 		code = ERR;
 		break;
 	    } else {
@@ -96,7 +96,7 @@ wget_wch(WINDOW *win, wint_t *result)
 		    reset_mbytes(state);
 		    if (check_mbytes(wch, buffer, count, state) != status) {
 			code = ERR;	/* the two calls should match */
-			safe_ungetch(SP_PARM, (int) value);
+			safe_ungetch(SP_PARM, value);
 		    }
 		    value = wch;
 		    break;
@@ -106,8 +106,8 @@ wget_wch(WINDOW *win, wint_t *result)
     } else {
 	code = ERR;
     }
-    *result = value;
+    *result = (wint_t) value;
     _nc_unlock_global(curses);
-    T(("result %#lo", value));
+    T(("result %#o", value));
     returnCode(code);
 }