ncurses 5.7 - patch 20090905

[ncurses.git] / test / gdc.c

diff --git a/test/gdc.c b/test/gdc.c
index 7aa2e0cadacbf694c27720b5f28049f5f07fcb5b..5eb36820f70bcbbbe608926d1daad3ebee363eed 100644 (file)
--- a/test/gdc.c
+++ b/test/gdc.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2008,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            *
@@ -33,7 +33,7 @@
  * modified 10-18-89 for curses (jrl)
  * 10-18-89 added signal handling
  *
- * $Id: gdc.c,v 1.29 2007/07/21 17:45:09 tom Exp $
+ * $Id: gdc.c,v 1.32 2009/08/29 19:02:25 tom Exp $
  */
 
 #include <test.priv.h>
@@ -78,20 +78,21 @@ drawbox(bool scrolling)
     int n;
 
     if (hascolor)
-       attrset(COLOR_PAIR(PAIR_FRAMES));
+       (void) attrset(COLOR_PAIR(PAIR_FRAMES));
 
     mvaddch(YBASE - 1, XBASE - 1, ACS_ULCORNER);
     hline(ACS_HLINE, XLENGTH);
     mvaddch(YBASE - 1, XBASE + XLENGTH, ACS_URCORNER);
 
     mvaddch(YBASE + YDEPTH, XBASE - 1, ACS_LLCORNER);
-    mvinchnstr(YBASE + YDEPTH, XBASE, bottom, XLENGTH);
-    for (n = 0; n < XLENGTH; n++) {
-       if (!scrolling)
-           bottom[n] &= ~A_COLOR;
-       bottom[n] = ACS_HLINE | (bottom[n] & (A_ATTRIBUTES | A_COLOR));
+    if ((mvinchnstr(YBASE + YDEPTH, XBASE, bottom, XLENGTH)) != ERR) {
+       for (n = 0; n < XLENGTH; n++) {
+           if (!scrolling)
+               bottom[n] &= ~A_COLOR;
+           bottom[n] = ACS_HLINE | (bottom[n] & (A_ATTRIBUTES | A_COLOR));
+       }
+       mvaddchnstr(YBASE + YDEPTH, XBASE, bottom, XLENGTH);
     }
-    mvaddchnstr(YBASE + YDEPTH, XBASE, bottom, XLENGTH);
     mvaddch(YBASE + YDEPTH, XBASE + XLENGTH, ACS_LRCORNER);
 
     move(YBASE, XBASE - 1);
@@ -101,7 +102,7 @@ drawbox(bool scrolling)
     vline(ACS_VLINE, YDEPTH);
 
     if (hascolor)
-       attrset(COLOR_PAIR(PAIR_OTHERS));
+       (void) attrset(COLOR_PAIR(PAIR_OTHERS));
 }
 
 static void
@@ -186,6 +187,7 @@ main(int argc, char *argv[])
     }
     if (optind < argc) {
        count = atoi(argv[optind++]);
+       assert(count >= 0);
     }
     if (optind < argc)
        usage();
@@ -218,7 +220,7 @@ main(int argc, char *argv[])
        init_pair(PAIR_DIGITS, COLOR_BLACK, COLOR_RED);
        init_pair(PAIR_OTHERS, COLOR_RED, bg);
        init_pair(PAIR_FRAMES, COLOR_WHITE, bg);
-       attrset(COLOR_PAIR(PAIR_OTHERS));
+       (void) attrset(COLOR_PAIR(PAIR_OTHERS));
     }
 
   restart:
@@ -333,7 +335,7 @@ main(int argc, char *argv[])
            goto restart;
        case ERR:
            if (sigtermed) {
-               standend();
+               (void) standend();
                endwin();
                fprintf(stderr, "gdc terminated by signal %d\n", sigtermed);
                ExitProgram(EXIT_FAILURE);
@@ -343,7 +345,7 @@ main(int argc, char *argv[])
            continue;
        }
     } while (--count);
-    standend();
+    (void) standend();
     endwin();
     ExitProgram(EXIT_SUCCESS);
 }