ncurses 5.9 - patch 20140816

[ncurses.git] / test / filter.c

diff --git a/test/filter.c b/test/filter.c
index 561a35b9274a5c0fcefc821e4d879846dbcf50c5..ab2d8562d996bf66799db66e717d9c3dbd4bdc78 100644 (file)
--- a/test/filter.c
+++ b/test/filter.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2012,2014 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            *


@@ -29,7 +29,7 @@
 /*
  * Author:  Thomas E. Dickey <dickey@clark.net> 1998
  *
 /*
  * Author:  Thomas E. Dickey <dickey@clark.net> 1998
  *

- * $Id: filter.c,v 1.12 2008/12/06 21:59:27 tom Exp $
+ * $Id: filter.c,v 1.16 2014/08/09 22:35:51 tom Exp $

  */
 #include <test.priv.h>
 
  */
 #include <test.priv.h>
 


@@ -48,7 +48,7 @@
  */
 
 static int
  */
 
 static int

-new_command(char *buffer, int length, attr_t underline)
+new_command(char *buffer, int length, int underline)

 {
     int code;
 
 {
     int code;
 


@@ -99,7 +99,7 @@ main(int argc, char *argv[])
 {
     int ch;
     char buffer[80];
 {
     int ch;
     char buffer[80];

-    attr_t underline;
+    int underline;

     bool i_option = FALSE;
 
     setlocale(LC_ALL, "");
     bool i_option = FALSE;
 
     setlocale(LC_ALL, "");


@@ -132,7 +132,7 @@ main(int argc, char *argv[])
        if (use_default_colors() != ERR)
            background = -1;
 #endif
        if (use_default_colors() != ERR)
            background = -1;
 #endif

-       init_pair(1, COLOR_CYAN, background);
+       init_pair(1, COLOR_CYAN, (short) background);

        underline = COLOR_PAIR(1);
     } else {
        underline = A_UNDERLINE;
        underline = COLOR_PAIR(1);
     } else {
        underline = A_UNDERLINE;


@@ -143,7 +143,7 @@ main(int argc, char *argv[])
        reset_shell_mode();
        printf("\n");
        fflush(stdout);
        reset_shell_mode();
        printf("\n");
        fflush(stdout);

-       system(buffer);
+       IGNORE_RC(system(buffer));

        reset_prog_mode();
        touchwin(stdscr);
        erase();
        reset_prog_mode();
        touchwin(stdscr);
        erase();