ncurses 5.7 - patch 20091017

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

diff --git a/ncurses/widechar/lib_get_wch.c b/ncurses/widechar/lib_get_wch.c
index 149d3bad13d17ecb150e0c5a359ea8d034f7a77c..c6ab927748faffa9d83a5e41f9ab8ca93fcd46da 100644 (file)
--- a/ncurses/widechar/lib_get_wch.c
+++ b/ncurses/widechar/lib_get_wch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2002-2007,2008 Free Software Foundation, Inc.              *
+ * Copyright (c) 2002-2008,2009 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            *
@@ -40,7 +40,7 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_get_wch.c,v 1.16 2008/06/07 15:14:33 tom Exp $")
+MODULE_ID("$Id: lib_get_wch.c,v 1.18 2009/04/18 22:41:33 tom Exp $")
 
 #if HAVE_MBTOWC && HAVE_MBLEN
 #define reset_mbytes(state) mblen(NULL, 0), mbtowc(NULL, NULL, 0)
@@ -95,23 +95,23 @@ wget_wch(WINDOW *win, wint_t *result)
                 * whether the improvement would be worth the effort.
                 */
                if (count != 0) {
-                   _nc_ungetch(sp, (int) value);
+                   safe_ungetch (SP_PARM, (int) value);
                    code = ERR;
                }
                break;
            } else if (count + 1 >= sizeof(buffer)) {
-               _nc_ungetch(sp, (int) value);
+               safe_ungetch (SP_PARM, (int) value);
                code = ERR;
                break;
            } else {
-               buffer[count++] = UChar(value);
+               buffer[count++] = (char) UChar(value);
                reset_mbytes(state);
                status = count_mbytes(buffer, count, state);
                if (status >= 0) {
                    reset_mbytes(state);
                    if (check_mbytes(wch, buffer, count, state) != status) {
                        code = ERR;     /* the two calls should match */
-                       _nc_ungetch(sp, (int) value);
+                       safe_ungetch (SP_PARM, (int) value);
                    }
                    value = wch;
                    break;