/****************************************************************************
- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-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 *
* modified 10-18-89 for curses (jrl)
* 10-18-89 added signal handling
*
- * $Id: gdc.c,v 1.31 2008/08/03 23:58:42 tom Exp $
+ * $Id: gdc.c,v 1.36 2012/12/29 22:51:57 tom Exp $
*/
#include <test.priv.h>
int n;
if (hascolor)
- attrset(COLOR_PAIR(PAIR_FRAMES));
+ (void) attrset((attr_t) COLOR_PAIR(PAIR_FRAMES));
- mvaddch(YBASE - 1, XBASE - 1, ACS_ULCORNER);
+ MvAddCh(YBASE - 1, XBASE - 1, ACS_ULCORNER);
hline(ACS_HLINE, XLENGTH);
- mvaddch(YBASE - 1, XBASE + XLENGTH, ACS_URCORNER);
+ MvAddCh(YBASE - 1, XBASE + XLENGTH, ACS_URCORNER);
- mvaddch(YBASE + YDEPTH, XBASE - 1, ACS_LLCORNER);
+ MvAddCh(YBASE + YDEPTH, XBASE - 1, ACS_LLCORNER);
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);
+ (void) mvaddchnstr(YBASE + YDEPTH, XBASE, bottom, XLENGTH);
}
- mvaddch(YBASE + YDEPTH, XBASE + XLENGTH, ACS_LRCORNER);
+ MvAddCh(YBASE + YDEPTH, XBASE + XLENGTH, ACS_LRCORNER);
move(YBASE, XBASE - 1);
vline(ACS_VLINE, YDEPTH);
vline(ACS_VLINE, YDEPTH);
if (hascolor)
- attrset(COLOR_PAIR(PAIR_OTHERS));
+ (void) attrset((attr_t) COLOR_PAIR(PAIR_OTHERS));
}
static void
{
if (on) {
if (hascolor) {
- attron(COLOR_PAIR(PAIR_DIGITS));
+ attron((attr_t) COLOR_PAIR(PAIR_DIGITS));
} else {
attron(A_STANDOUT);
}
} else {
if (hascolor) {
- attron(COLOR_PAIR(PAIR_OTHERS));
+ attron((attr_t) COLOR_PAIR(PAIR_OTHERS));
} else {
attroff(A_STANDOUT);
}
hascolor = has_colors();
if (hascolor) {
- int bg = COLOR_BLACK;
+ short bg = COLOR_BLACK;
start_color();
#if HAVE_USE_DEFAULT_COLORS
if (use_default_colors() == OK)
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((attr_t) COLOR_PAIR(PAIR_OTHERS));
}
restart:
drawbox(FALSE);
do {
- char buf[30];
+ char buf[40];
time(&now);
tm = localtime(&now);
}
/* this depends on the detailed format of ctime(3) */
- (void) strcpy(buf, ctime(&now));
+ (void) strncpy(buf, ctime(&now), 30);
(void) strcpy(buf + 10, buf + 19);
- mvaddstr(16, 30, buf);
+ MvAddStr(16, 30, buf);
move(6, 0);
drawbox(FALSE);
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);
}