ncurses 5.9 - patch 20120616

[ncurses.git] / test / cardfile.c

diff --git a/test/cardfile.c b/test/cardfile.c
index 68ae4fe0526e1721b40bd04a368d6ebf8b5fe295..c549659b493ad569fb7795ea2e8defb4add3e9a2 100644 (file)
--- a/test/cardfile.c
+++ b/test/cardfile.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1999-2007,2008 Free Software Foundation, Inc.              *
+ * Copyright (c) 1999-2010,2012 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            *
@@ -29,7 +29,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: cardfile.c,v 1.35 2008/08/05 00:42:24 tom Exp $
+ * $Id: cardfile.c,v 1.39 2012/06/09 20:30:32 tom Exp $
  *
  * File format: text beginning in column 1 is a title; other text is content.
  */
@@ -91,7 +91,7 @@ skip(const char *buffer)
 static void
 trim(char *buffer)
 {
-    unsigned n = strlen(buffer);
+    size_t n = strlen(buffer);
     while (n-- && isspace(UChar(buffer[n])))
        buffer[n] = 0;
 }
@@ -129,7 +129,7 @@ add_title(const char *title)
 static void
 add_content(CARD * card, const char *content)
 {
-    unsigned total, offset;
+    size_t total, offset;
 
     content = skip(content);
     if ((total = strlen(content)) != 0) {
@@ -262,7 +262,7 @@ next_card(CARD * now)
        if (isVisible(tst))
            now = tst;
        else
-           tst = next_card(tst);
+           (void) next_card(tst);
     }
     return now;
 }
@@ -414,7 +414,7 @@ cardfile(char *fname)
        if ((win = newwin(panel_high, panel_wide, y, x)) == 0)
            break;
 
-       wbkgd(win, COLOR_PAIR(pair_2));
+       wbkgd(win, (chtype) COLOR_PAIR(pair_2));
        keypad(win, TRUE);
        p->panel = new_panel(win);
        box(win, 0, 0);
@@ -523,14 +523,12 @@ cardfile(char *fname)
 #if NO_LEAKS
     while (all_cards != 0) {
        FIELD **f;
-       int count;
 
        p = all_cards;
        all_cards = all_cards->link;
 
        if (isVisible(p)) {
            f = form_fields(p->form);
-           count = field_count(p->form);
 
            unpost_form(p->form);       /* ...so we can free it */
            free_form(p->form); /* this also disconnects the fields */
@@ -590,7 +588,7 @@ main(int argc, char *argv[])
            start_color();
            init_pair(pair_1, COLOR_WHITE, COLOR_BLUE);
            init_pair(pair_2, COLOR_WHITE, COLOR_CYAN);
-           bkgd(COLOR_PAIR(pair_1));
+           bkgd((chtype) COLOR_PAIR(pair_1));
        } else {
            try_color = FALSE;
        }