nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

tty build warning

Browse Source 
Use casts to try to suppress a couple of assignments of long to short
that Michael's compiler warns about.  'cw->maxrow' might have a value
that's too big for 'short' (when dealing with really big menus), but
'cw->maxcol' never will (unless someone comes up with a terminal or
emulator that's wider that 32K-1 characters...).
This commit is contained in:
PatR
2015-11-13 01:12:43 -08:00
parent 4387bde968
commit 2e5818d803
1 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win/tty/wintty.c
+34 -32
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 wintty.c $NHDT-Date: 1447253778 2015/11/11 14:56:18 $ $NHDT-Branch: master $:$NHDT-Revision: 1.113 $ */ /* NetHack 3.6 wintty.c $NHDT-Date: 1447405953 2015/11/13 09:12:33 $ $NHDT-Branch: master $:$NHDT-Revision: 1.114 $ */
/* Copyright (c) David Cohrs, 1991 */ /* Copyright (c) David Cohrs, 1991 */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -1312,9 +1312,10 @@ int type;
newwin->datlen = newwin->datlen =
(short *) alloc(sizeof(short) * (unsigned) newwin->maxrow); (short *) alloc(sizeof(short) * (unsigned) newwin->maxrow);
if (newwin->maxcol) { if (newwin->maxcol) {
/* WIN_STATUS */
for (i = 0; i < newwin->maxrow; i++) { for (i = 0; i < newwin->maxrow; i++) {
newwin->data[i] = (char *) alloc((unsigned) newwin->maxcol); newwin->data[i] = (char *) alloc((unsigned) newwin->maxcol);
newwin->datlen[i] = newwin->maxcol; newwin->datlen[i] = (short) newwin->maxcol;
} }
} else { } else {
for (i = 0; i < newwin->maxrow; i++) { for (i = 0; i < newwin->maxrow; i++) {
@@ -2031,6 +2032,7 @@ winid window;
boolean blocking; /* with ttys, all windows are blocking */ boolean blocking; /* with ttys, all windows are blocking */
{ {
register struct WinDesc *cw = 0; register struct WinDesc *cw = 0;
short s_maxcol;
if (window == WIN_ERR || (cw = wins[window]) == (struct WinDesc *) 0) if (window == WIN_ERR || (cw = wins[window]) == (struct WinDesc *) 0)
panic(winpanicstr, window); panic(winpanicstr, window);
@@ -2067,15 +2069,18 @@ boolean blocking; /* with ttys, all windows are blocking */
/*FALLTHRU*/ /*FALLTHRU*/
case NHW_MENU: case NHW_MENU:
cw->active = 1; cw->active = 1;
/* cw->maxcol is a long, but its value is constrained to
be <= ttyDisplay->cols, so is sure to fit within a short */
s_maxcol = (short) cw->maxcol;
#ifdef H2344_BROKEN #ifdef H2344_BROKEN
cw->offx = (cw->type == NHW_TEXT) cw->offx = (cw->type == NHW_TEXT)
? 0 ? 0
: min(min(82, ttyDisplay->cols / 2), : min(min(82, ttyDisplay->cols / 2),
ttyDisplay->cols - cw->maxcol - 1); ttyDisplay->cols - s_maxcol - 1);
#else #else
/* avoid converting to uchar before calculations are finished */ /* avoid converting to uchar before calculations are finished */
cw->offx = (uchar)(int) max( cw->offx = (uchar) max((int) 10,
(int) 10, (int) (ttyDisplay->cols - cw->maxcol - 1)); (int) (ttyDisplay->cols - s_maxcol - 1));
#endif #endif
if (cw->offx < 0) if (cw->offx < 0)
cw->offx = 0; cw->offx = 0;
@@ -3318,17 +3323,17 @@ genericptr_t ptr;
* BL_HILITE_INVERSE -2 + 3 = 1 (statusattr[1]) * BL_HILITE_INVERSE -2 + 3 = 1 (statusattr[1])
* BL_HILITE_BOLD -3 + 3 = 0 (statusattr[0]) * BL_HILITE_BOLD -3 + 3 = 0 (statusattr[0])
*/ */
int statusattr[] = {ATR_BOLD, ATR_INVERSE, ATR_NONE}; int statusattr[] = { ATR_BOLD, ATR_INVERSE, ATR_NONE };
int attridx = 0; int attridx = 0;
long value = -1L; long value = -1L;
static boolean beenhere = FALSE; static boolean beenhere = FALSE;
enum statusfields fieldorder[2][15] = { enum statusfields fieldorder[2][15] = {
{ BL_TITLE, BL_STR, BL_DX, BL_CO, BL_IN, BL_WI, BL_CH, BL_ALIGN, { BL_TITLE, BL_STR, BL_DX, BL_CO, BL_IN, BL_WI, BL_CH, BL_ALIGN,
BL_SCORE, BL_FLUSH, BL_FLUSH, BL_FLUSH, BL_FLUSH, BL_FLUSH, BL_SCORE, BL_FLUSH, BL_FLUSH, BL_FLUSH, BL_FLUSH, BL_FLUSH,
BL_FLUSH }, BL_FLUSH },
{ BL_LEVELDESC, BL_GOLD, BL_HP, BL_HPMAX, BL_ENE, BL_ENEMAX, { BL_LEVELDESC, BL_GOLD, BL_HP, BL_HPMAX, BL_ENE, BL_ENEMAX,
BL_AC, BL_XP, BL_EXP, BL_HD, BL_TIME, BL_HUNGER, BL_AC, BL_XP, BL_EXP, BL_HD, BL_TIME, BL_HUNGER,
BL_CAP, BL_CONDITION, BL_FLUSH } BL_CAP, BL_CONDITION, BL_FLUSH }
}; };
if (fldidx != BL_FLUSH) { if (fldidx != BL_FLUSH) {
@@ -3357,8 +3362,8 @@ genericptr_t ptr;
default: default:
value = atol(text); value = atol(text);
Sprintf(status_vals[fldidx], Sprintf(status_vals[fldidx],
status_fieldfmt[fldidx] ? status_fieldfmt[fldidx] : status_fieldfmt[fldidx] ? status_fieldfmt[fldidx] : "%s",
"%s", text); text);
break; break;
} }
@@ -3367,7 +3372,6 @@ genericptr_t ptr;
case BL_TH_NONE: case BL_TH_NONE:
tty_status_colors[fldidx] = NO_COLOR; tty_status_colors[fldidx] = NO_COLOR;
break; break;
case BL_TH_UPDOWN: case BL_TH_UPDOWN:
if (chg > 0) if (chg > 0)
tty_status_colors[fldidx] = tty_status_hilites[fldidx].over; tty_status_colors[fldidx] = tty_status_hilites[fldidx].over;
@@ -3376,29 +3380,27 @@ genericptr_t ptr;
else else
tty_status_colors[fldidx] = NO_COLOR; tty_status_colors[fldidx] = NO_COLOR;
break; break;
case BL_TH_VAL_PERCENTAGE: {
case BL_TH_VAL_PERCENTAGE:
{
int pct_th = 0; int pct_th = 0;
if (tty_status_hilites[fldidx].thresholdtype != ANY_INT) { if (tty_status_hilites[fldidx].thresholdtype != ANY_INT) {
impossible( impossible(
"tty_status_update: unsupported percentage threshold type %d", "tty_status_update: unsupported percentage threshold type %d",
tty_status_hilites[fldidx].thresholdtype); tty_status_hilites[fldidx].thresholdtype);
break; } else {
pct_th = tty_status_hilites[fldidx].threshold.a_int;
tty_status_colors[fldidx] = (percent >= pct_th)
? tty_status_hilites[fldidx].over
: tty_status_hilites[fldidx].under;
} }
pct_th = tty_status_hilites[fldidx].threshold.a_int; break;
tty_status_colors[fldidx] = (percent >= pct_th)
? tty_status_hilites[fldidx].over
: tty_status_hilites[fldidx].under;
} }
break; case BL_TH_VAL_ABSOLUTE: {
case BL_TH_VAL_ABSOLUTE:
{
int c = NO_COLOR; int c = NO_COLOR;
int o = tty_status_hilites[fldidx].over; int o = tty_status_hilites[fldidx].over;
int u = tty_status_hilites[fldidx].under; int u = tty_status_hilites[fldidx].under;
anything *t = &tty_status_hilites[fldidx].threshold; anything *t = &tty_status_hilites[fldidx].threshold;
switch (tty_status_hilites[fldidx].thresholdtype) { switch (tty_status_hilites[fldidx].thresholdtype) {
case ANY_LONG: case ANY_LONG:
c = (value >= t->a_long) ? o : u; c = (value >= t->a_long) ? o : u;
@@ -3417,14 +3419,14 @@ genericptr_t ptr;
break; break;
default: default:
impossible( impossible(
"tty_status_update: unsupported absolute threshold type %d\n", "tty_status_update: unsupported absolute threshold type %d\n",
tty_status_hilites[fldidx].thresholdtype); tty_status_hilites[fldidx].thresholdtype);
break; break;
} }
tty_status_colors[fldidx] = c; tty_status_colors[fldidx] = c;
} break;
break; } /* case */
} } /* switch */
#endif /* STATUS_HILITES */ #endif /* STATUS_HILITES */
} }