ncurses 5.9 - patch 20121102

[ncurses.git] / test / cardfile.c

diff --git a/test/cardfile.c b/test/cardfile.c
index 755a28b7baae0ac73953911ee7b7a4ae7e61cded..ef224c9b9006e82418ac53a92cee0ea759d968be 100644 (file)
--- a/test/cardfile.c
+++ b/test/cardfile.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1999-2006,2007 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.31 2007/07/21 17:41:55 tom Exp $
+ * $Id: cardfile.c,v 1.41 2012/11/03 19:26:50 tom Exp $
  *
  * File format: text beginning in column 1 is a title; other text is content.
  */
@@ -68,17 +68,13 @@ static CARD *all_cards;
 static bool try_color = FALSE;
 static char default_name[] = "cardfile.dat";
 
-#if !HAVE_STRDUP
-#define strdup my_strdup
-static char *
-strdup(char *s)
+static void
+failed(const char *s)
 {
-    char *p = (char *) malloc(strlen(s) + 1);
-    if (p)
-       strcpy(p, s);
-    return (p);
+    perror(s);
+    endwin();
+    ExitProgram(EXIT_FAILURE);
 }
-#endif /* not HAVE_STRDUP */
 
 static const char *
 skip(const char *buffer)
@@ -91,7 +87,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;
 }
@@ -111,7 +107,7 @@ add_title(const char *title)
            break;
     }
 
-    card = (CARD *) calloc(1, sizeof(CARD));
+    card = typeCalloc(CARD, 1);
     card->title = strdup(title);
     card->content = strdup("");
 
@@ -129,22 +125,25 @@ 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) {
-       if ((offset = strlen(card->content)) != 0) {
+       if (card->content != 0 && (offset = strlen(card->content)) != 0) {
            total += 1 + offset;
-           card->content = (char *) realloc(card->content, total + 1);
+           card->content = typeRealloc(char, total + 1, card->content);
            if (card->content)
                strcpy(card->content + offset++, " ");
        } else {
+           offset = 0;
            if (card->content != 0)
                free(card->content);
-           card->content = (char *) malloc(total + 1);
+           card->content = typeMalloc(char, total + 1);
        }
        if (card->content)
            strcpy(card->content + offset, content);
+       else
+           failed("add_content");
     }
 }
 
@@ -261,7 +260,7 @@ next_card(CARD * now)
        if (isVisible(tst))
            now = tst;
        else
-           tst = next_card(tst);
+           (void) next_card(tst);
     }
     return now;
 }
@@ -336,7 +335,7 @@ form_virtualize(WINDOW *w)
 static FIELD **
 make_fields(CARD * p, int form_high, int form_wide)
 {
-    FIELD **f = (FIELD **) calloc(3, sizeof(FIELD *));
+    FIELD **f = typeCalloc(FIELD *, 3);
 
     f[0] = new_field(1, form_wide, 0, 0, 0, 0);
     set_field_back(f[0], A_REVERSE);
@@ -413,7 +412,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);
@@ -522,14 +521,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 */
@@ -589,7 +586,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;
        }