ncurses 5.7 - patch 20101225

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

diff --git a/ncurses/base/lib_scroll.c b/ncurses/base/lib_scroll.c
index ac85bd55ea1d50f773e4c1b57350fa1d3b50277d..fe4e80804daef3de444430a3418cb7c587708ec3 100644 (file)
--- a/ncurses/base/lib_scroll.c
+++ b/ncurses/base/lib_scroll.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2004,2006 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2009,2010 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            *


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

-MODULE_ID("$Id: lib_scroll.c,v 1.26 2006/10/14 20:46:08 tom Exp $")
+MODULE_ID("$Id: lib_scroll.c,v 1.28 2010/12/19 01:48:09 tom Exp $")

 
 NCURSES_EXPORT(void)
 _nc_scroll_window(WINDOW *win,
 
 NCURSES_EXPORT(void)
 _nc_scroll_window(WINDOW *win,


@@ -55,10 +55,10 @@ _nc_scroll_window(WINDOW *win,
     int limit;
     int line;
     int j;
     int limit;
     int line;
     int j;

-    size_t to_copy = (size_t) (sizeof(NCURSES_CH_T) * (win->_maxx + 1));
+    size_t to_copy = (sizeof(NCURSES_CH_T) * (size_t) (win->_maxx + 1));

 
     TR(TRACE_MOVE, ("_nc_scroll_window(%p, %d, %ld, %ld)",
 
     TR(TRACE_MOVE, ("_nc_scroll_window(%p, %d, %ld, %ld)",

-                   win, n, (long) top, (long) bottom));
+                   (void *) win, n, (long) top, (long) bottom));

 
     if (top < 0
        || bottom < top
 
     if (top < 0
        || bottom < top


@@ -135,7 +135,7 @@ _nc_scroll_window(WINDOW *win,
 NCURSES_EXPORT(int)
 wscrl(WINDOW *win, int n)
 {
 NCURSES_EXPORT(int)
 wscrl(WINDOW *win, int n)
 {

-    T((T_CALLED("wscrl(%p,%d)"), win, n));
+    T((T_CALLED("wscrl(%p,%d)"), (void *) win, n));

 
     if (!win || !win->_scroll) {
        TR(TRACE_MOVE, ("...scrollok is false"));
 
     if (!win || !win->_scroll) {
        TR(TRACE_MOVE, ("...scrollok is false"));