ncurses 5.9 - patch 20120903

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

diff --git a/ncurses/base/lib_touch.c b/ncurses/base/lib_touch.c
index 7ce863d06f104ce295a840c9621db836ea51c49f..20ac9450f15f6bc8738d0dd728c13ff50fa172ca 100644 (file)
--- a/ncurses/base/lib_touch.c
+++ b/ncurses/base/lib_touch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998-2010,2012 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            *
@@ -43,45 +43,51 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_touch.c,v 1.6 1998/04/11 22:55:02 tom Exp $")
+MODULE_ID("$Id: lib_touch.c,v 1.12 2012/06/09 20:29:33 tom Exp $")
 
-bool is_linetouched(WINDOW *win, int line)
+NCURSES_EXPORT(bool)
+is_linetouched(WINDOW *win, int line)
 {
-       T((T_CALLED("is_linetouched(%p,%d)"), win, line));
+    T((T_CALLED("is_linetouched(%p,%d)"), (void *) win, line));
 
-       /* XSI doesn't define any error */
-       if (!win || (line > win->_maxy) || (line < 0))
-               returnCode(ERR);
+    /* XSI doesn't define any error */
+    if (!win || (line > win->_maxy) || (line < 0))
+       returnCode((bool) ERR);
 
-       returnCode(win->_line[line].firstchar != _NOCHANGE ? TRUE : FALSE);
+    returnCode(win->_line[line].firstchar != _NOCHANGE ? TRUE : FALSE);
 }
 
-bool is_wintouched(WINDOW *win)
+NCURSES_EXPORT(bool)
+is_wintouched(WINDOW *win)
 {
-int i;
+    int i;
 
-       T((T_CALLED("is_wintouched(%p)"), win));
+    T((T_CALLED("is_wintouched(%p)"), (void *) win));
 
-       if (win)
-               for (i = 0; i <= win->_maxy; i++)
-                       if (win->_line[i].firstchar != _NOCHANGE)
-                               returnCode(TRUE);
-       returnCode(FALSE);
+    if (win)
+       for (i = 0; i <= win->_maxy; i++)
+           if (win->_line[i].firstchar != _NOCHANGE)
+               returnCode(TRUE);
+    returnCode(FALSE);
 }
 
-int wtouchln(WINDOW *win, int y, int n, int changed)
+NCURSES_EXPORT(int)
+wtouchln(WINDOW *win, int y, int n, int changed)
 {
-int i;
+    int i;
 
-       T((T_CALLED("wtouchln(%p,%d,%d,%d)"), win, y, n, changed));
+    T((T_CALLED("wtouchln(%p,%d,%d,%d)"), (void *) win, y, n, changed));
 
-       if (!win || (n<0) || (y<0) || (y>win->_maxy))
-         returnCode(ERR);
+    if (!win || (n < 0) || (y < 0) || (y > win->_maxy))
+       returnCode(ERR);
 
-       for (i = y; i < y+n; i++) {
-               if (i>win->_maxy) break;
-               win->_line[i].firstchar = changed ? 0 : _NOCHANGE;
-               win->_line[i].lastchar = changed ? win->_maxx : _NOCHANGE;
-       }
-       returnCode(OK);
+    for (i = y; i < y + n; i++) {
+       if (i > win->_maxy)
+           break;
+       win->_line[i].firstchar = (NCURSES_SIZE_T) (changed ? 0 : _NOCHANGE);
+       win->_line[i].lastchar = (NCURSES_SIZE_T) (changed
+                                                  ? win->_maxx
+                                                  : _NOCHANGE);
+    }
+    returnCode(OK);
 }