/****************************************************************************
- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2008,2009 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 *
* modified 10-18-89 for curses (jrl)
* 10-18-89 added signal handling
*
- * $Id: gdc.c,v 1.28 2006/05/20 15:37:44 tom Exp $
+ * $Id: gdc.c,v 1.32 2009/08/29 19:02:25 tom Exp $
*/
#include <test.priv.h>
int n;
if (hascolor)
- attrset(COLOR_PAIR(PAIR_FRAMES));
+ (void) attrset(COLOR_PAIR(PAIR_FRAMES));
mvaddch(YBASE - 1, XBASE - 1, ACS_ULCORNER);
hline(ACS_HLINE, XLENGTH);
mvaddch(YBASE - 1, XBASE + XLENGTH, ACS_URCORNER);
mvaddch(YBASE + YDEPTH, XBASE - 1, ACS_LLCORNER);
- mvinchnstr(YBASE + YDEPTH, XBASE, bottom, XLENGTH);
- for (n = 0; n < XLENGTH; n++) {
- if (!scrolling)
- bottom[n] &= ~A_COLOR;
- bottom[n] = ACS_HLINE | (bottom[n] & (A_ATTRIBUTES | A_COLOR));
+ 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);
}
- mvaddchnstr(YBASE + YDEPTH, XBASE, bottom, XLENGTH);
mvaddch(YBASE + YDEPTH, XBASE + XLENGTH, ACS_LRCORNER);
move(YBASE, XBASE - 1);
vline(ACS_VLINE, YDEPTH);
if (hascolor)
- attrset(COLOR_PAIR(PAIR_OTHERS));
+ (void) attrset(COLOR_PAIR(PAIR_OTHERS));
}
static void
CATCHALL(sighndl);
- while ((k = getopt(argc, argv, "sn")) != EOF) {
+ while ((k = getopt(argc, argv, "sn")) != -1) {
switch (k) {
case 's':
scrol = TRUE;
}
if (optind < argc) {
count = atoi(argv[optind++]);
+ assert(count >= 0);
}
if (optind < argc)
usage();
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:
goto restart;
case ERR:
if (sigtermed) {
- standend();
+ (void) standend();
endwin();
fprintf(stderr, "gdc terminated by signal %d\n", sigtermed);
ExitProgram(EXIT_FAILURE);
continue;
}
} while (--count);
- standend();
+ (void) standend();
endwin();
ExitProgram(EXIT_SUCCESS);
}