X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fcardfile.c;h=ef224c9b9006e82418ac53a92cee0ea759d968be;hp=a0034728fd113b0df66c3d15599d0b87d9202b1e;hb=1385381954c39dc95558adc87fad457046959cc1;hpb=396a05943b7da5039dd15d79c4385c7d2a75d6d4

diff --git a/test/cardfile.c b/test/cardfile.c
index a0034728..ef224c9b 100644
--- 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.33 2008/04/12 22:05:53 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(const char *s)
+static void
+failed(const char *s)
 {
-    char *p = typeMalloc(char, 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;
 }
@@ -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 = 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 = 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;
 }
@@ -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;
 	}