ncurses 5.9 - patch 20111022

[ncurses.git] / ncurses / base / lib_getch.c

diff --git a/ncurses/base/lib_getch.c b/ncurses/base/lib_getch.c
index 24acf055674c5a1020cc9c1c0d3616d52b8ace22..7ee9e794a93c5989ad085e95512aec4fd277973c 100644 (file)
--- a/ncurses/base/lib_getch.c
+++ b/ncurses/base/lib_getch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -42,7 +42,7 @@
 
 #include <curses.priv.h>
 
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_getch.c,v 1.119 2010/05/22 20:00:35 tom Exp $")
+MODULE_ID("$Id: lib_getch.c,v 1.122 2011/10/22 16:34:50 tom Exp $")

 
 #include <fifo_defs.h>
 
 
 #include <fifo_defs.h>
 


@@ -270,7 +270,7 @@ fifo_push(SCREEN *sp EVENTLIST_2nd(_nc_eventlist * evl))
 #  endif
            _nc_globals.read_thread = pthread_self();
 # endif
 #  endif
            _nc_globals.read_thread = pthread_self();
 # endif

-       n = read(sp->_ifd, &c2, 1);
+       n = (int) read(sp->_ifd, &c2, (size_t) 1);

 #if USE_PTHREADS_EINTR
        _nc_globals.read_thread = 0;
 #endif
 #if USE_PTHREADS_EINTR
        _nc_globals.read_thread = 0;
 #endif


@@ -383,7 +383,7 @@ recur_wgetnstr(WINDOW *win, char *buf)
 
 NCURSES_EXPORT(int)
 _nc_wgetch(WINDOW *win,
 
 NCURSES_EXPORT(int)
 _nc_wgetch(WINDOW *win,

-          unsigned long *result,
+          int *result,

           int use_meta
           EVENTLIST_2nd(_nc_eventlist * evl))
 {
           int use_meta
           EVENTLIST_2nd(_nc_eventlist * evl))
 {


@@ -581,7 +581,7 @@ _nc_wgetch(WINDOW *win,
      * cursor to the left.
      */
     if (sp->_echo && !(win->_flags & _ISPAD)) {
      * cursor to the left.
      */
     if (sp->_echo && !(win->_flags & _ISPAD)) {

-       chtype backup = (ch == KEY_BACKSPACE) ? '\b' : ch;
+       chtype backup = (chtype) ((ch == KEY_BACKSPACE) ? '\b' : ch);

        if (backup < KEY_MIN)
            wechochar(win, backup);
     }
        if (backup < KEY_MIN)
            wechochar(win, backup);
     }


@@ -612,7 +612,7 @@ NCURSES_EXPORT(int)
 wgetch_events(WINDOW *win, _nc_eventlist * evl)
 {
     int code;
 wgetch_events(WINDOW *win, _nc_eventlist * evl)
 {
     int code;

-    unsigned long value;
+    int value;

 
     T((T_CALLED("wgetch_events(%p,%p)"), win, evl));
     code = _nc_wgetch(win,
 
     T((T_CALLED("wgetch_events(%p,%p)"), win, evl));
     code = _nc_wgetch(win,


@@ -629,7 +629,7 @@ NCURSES_EXPORT(int)
 wgetch(WINDOW *win)
 {
     int code;
 wgetch(WINDOW *win)
 {
     int code;

-    unsigned long value;
+    int value;

 
     T((T_CALLED("wgetch(%p)"), (void *) win));
     code = _nc_wgetch(win,
 
     T((T_CALLED("wgetch(%p)"), (void *) win));
     code = _nc_wgetch(win,