ncurses 5.9 - patch 20141220

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

diff --git a/ncurses/base/lib_move.c b/ncurses/base/lib_move.c
index 6f5bddff33ea3bd80b8035569bc3f9b6a3f55c01..488b195d15a3c3f44be611c104dbb2064257bb9a 100644 (file)
--- a/ncurses/base/lib_move.c
+++ b/ncurses/base/lib_move.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998-2004,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            *
@@ -29,9 +29,9 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
+ *     and: Thomas E. Dickey                        1996-on                 *
  ****************************************************************************/
 
-
 /*
 **     lib_move.c
 **
@@ -41,23 +41,20 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_move.c,v 1.8 1998/02/11 12:13:53 tom Exp $")
+MODULE_ID("$Id: lib_move.c,v 1.13 2009/10/24 22:34:07 tom Exp $")
 
-int
+NCURSES_EXPORT(int)
 wmove(WINDOW *win, int y, int x)
 {
-       T((T_CALLED("wmove(%p,%d,%d)"), win, y, x));
+    T((T_CALLED("wmove(%p,%d,%d)"), (void *) win, y, x));
 
-       if (win && 
-           x >= 0  &&  x <= win->_maxx  &&
-           y >= 0  &&  y <= win->_maxy)
-       {
-               win->_curx = (short)x;
-               win->_cury = (short)y;
+    if (LEGALYX(win, y, x)) {
+       win->_curx = (NCURSES_SIZE_T) x;
+       win->_cury = (NCURSES_SIZE_T) y;
 
-               win->_flags &= ~_WRAPPED;
-               win->_flags |= _HASMOVED;
-               returnCode(OK);
-       } else
-               returnCode(ERR);
+       win->_flags &= ~_WRAPPED;
+       win->_flags |= _HASMOVED;
+       returnCode(OK);
+    } else
+       returnCode(ERR);
 }