ncurses 5.7 - patch 20100501

[ncurses.git] / test / gdc.c

diff --git a/test/gdc.c b/test/gdc.c
index ef220fed59ba7f6ead313bc6f46622c56f247336..7209adb40ca8109781fe1202f12a26dce9f63a08 100644 (file)
--- a/test/gdc.c
+++ b/test/gdc.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2007,2008 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            *
@@ -33,7 +33,7 @@
  * modified 10-18-89 for curses (jrl)
  * 10-18-89 added signal handling
  *
- * $Id: gdc.c,v 1.31 2008/08/03 23:58:42 tom Exp $
+ * $Id: gdc.c,v 1.33 2010/05/01 19:12:26 tom Exp $
  */
 
 #include <test.priv.h>
@@ -78,22 +78,22 @@ 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);
+    MvAddCh(YBASE - 1, XBASE - 1, ACS_ULCORNER);
     hline(ACS_HLINE, XLENGTH);
-    mvaddch(YBASE - 1, XBASE + XLENGTH, ACS_URCORNER);
+    MvAddCh(YBASE - 1, XBASE + XLENGTH, ACS_URCORNER);
 
-    mvaddch(YBASE + YDEPTH, XBASE - 1, ACS_LLCORNER);
+    MvAddCh(YBASE + YDEPTH, XBASE - 1, ACS_LLCORNER);
     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);
+       (void) mvaddchnstr(YBASE + YDEPTH, XBASE, bottom, XLENGTH);
     }
-    mvaddch(YBASE + YDEPTH, XBASE + XLENGTH, ACS_LRCORNER);
+    MvAddCh(YBASE + YDEPTH, XBASE + XLENGTH, ACS_LRCORNER);
 
     move(YBASE, XBASE - 1);
     vline(ACS_VLINE, YDEPTH);
@@ -102,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
@@ -220,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:
@@ -295,7 +295,7 @@ main(int argc, char *argv[])
        /* this depends on the detailed format of ctime(3) */
        (void) strcpy(buf, ctime(&now));
        (void) strcpy(buf + 10, buf + 19);
-       mvaddstr(16, 30, buf);
+       MvAddStr(16, 30, buf);
 
        move(6, 0);
        drawbox(FALSE);
@@ -335,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);
@@ -345,7 +345,7 @@ main(int argc, char *argv[])
            continue;
        }
     } while (--count);
-    standend();
+    (void) standend();
     endwin();
     ExitProgram(EXIT_SUCCESS);
 }