ncurses 5.7 - patch 20100703

[ncurses.git] / test / view.c

diff --git a/test/view.c b/test/view.c
index 5b52e9807696c9a5f02ccd6ccdf2a73f2817f3a8..5c609fa6fd1604e74dad4562b0600dc0e4bfb90d 100644 (file)
--- a/test/view.c
+++ b/test/view.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2008,2009 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            *
@@ -50,7 +50,7 @@
  * scroll operation worked, and the refresh() code only had to do a
  * partial repaint.
  *
- * $Id: view.c,v 1.76 2009/10/24 21:26:38 tom Exp $
+ * $Id: view.c,v 1.79 2010/05/01 21:56:10 tom Exp $
  */
 
 #include <test.priv.h>
@@ -294,6 +294,8 @@ main(int argc, char *argv[])
     if ((vec_lines = typeCalloc(NCURSES_CH_T *, MAXLINES + 2)) == 0)
        usage();
 
+    assert(vec_lines != 0);
+
     fname = argv[optind];
     if ((fp = fopen(fname, "r")) == 0) {
        perror(fname);
@@ -365,7 +367,6 @@ main(int argc, char *argv[])
        if (!got_number)
            show_all(my_label);
 
-       n = 0;
        for (;;) {
 #if CAN_RESIZE
            if (interrupted) {
@@ -378,7 +379,7 @@ main(int argc, char *argv[])
            waiting = FALSE;
            if ((c < 127) && isdigit(c)) {
                if (!got_number) {
-                   mvprintw(0, 0, "Count: ");
+                   MvPrintw(0, 0, "Count: ");
                    clrtoeol();
                }
                addch(UChar(c));
@@ -500,12 +501,11 @@ finish(int sig)
 
 #if CAN_RESIZE
 /*
- * This uses functions that are "unsafe", but it seems to work on SunOS and
- * Linux.  Usually:  the "unsafe" refers to the functions that POSIX lists
- * which may be called from a signal handler.  Those do not include buffered
- * I/O, which is used for instance in wrefresh().  To be really portable, you
- * should use the KEY_RESIZE return (which relies on ncurses' sigwinch
- * handler).
+ * This uses functions that are "unsafe", but it seems to work on SunOS. 
+ * Usually: the "unsafe" refers to the functions that POSIX lists which may be
+ * called from a signal handler.  Those do not include buffered I/O, which is
+ * used for instance in wrefresh().  To be really portable, you should use the
+ * KEY_RESIZE return (which relies on ncurses' sigwinch handler).
  *
  * The 'wrefresh(curscr)' is needed to force the refresh to start from the top
  * of the screen -- some xterms mangle the bitmap while resizing.
@@ -518,7 +518,7 @@ adjust(int sig)
 
        if (ioctl(fileno(stdout), TIOCGWINSZ, &size) == 0) {
            resize_term(size.ws_row, size.ws_col);
-           wrefresh(curscr);   /* Linux needs this */
+           wrefresh(curscr);
            show_all(sig ? "SIGWINCH" : "interrupt");
        }
        interrupted = FALSE;