home
·
contact
·
privacy
projects
/
plomrogue
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5d9d7aa
)
Uise uint32_t to test for a value going beyond UINT16_MAX.
author
Christian Heller
<c.heller@plomlompom.de>
Tue, 27 Aug 2013 00:39:15 +0000
(
02:39
+0200)
committer
Christian Heller
<c.heller@plomlompom.de>
Tue, 27 Aug 2013 00:39:15 +0000
(
02:39
+0200)
src/windows.c
patch
|
blob
|
history
diff --git
a/src/windows.c
b/src/windows.c
index a7bf88fc22ba063b46de8d6fc49aa6a4adf3ab83..6257d4bf39b75107f3129d443d3bcc0dde84f657 100644
(file)
--- a/
src/windows.c
+++ b/
src/windows.c
@@
-365,23
+365,23
@@
static void shift_win_backward(struct WinMeta * wmeta)
extern uint8_t init_win_meta(WINDOW * screen, struct WinMeta * wmeta)
{
wmeta->_screen = screen;
extern uint8_t init_win_meta(WINDOW * screen, struct WinMeta * wmeta)
{
wmeta->_screen = screen;
- wmeta->padframe.size.y = getmaxy(screen);
- wmeta->padframe.size.x = getmaxx(screen);
- if ( wmeta->padframe.size.y > UINT16_MAX
- || wmeta->padframe.size.x > UINT16_MAX)
+ uint32_t maxy_test = getmaxy(screen);
+ uint32_t maxx_test = getmaxx(screen);
+ if (maxy_test > UINT16_MAX || maxx_test > UINT16_MAX)
{
return 2;
}
{
return 2;
}
+ wmeta->padframe.size.y = maxy_test;
+ wmeta->padframe.size.x = maxx_test;
wmeta->_chain_start = 0;
wmeta->_chain_end = 0;
wmeta->pad_offset = 0;
wmeta->_chain_start = 0;
wmeta->_chain_end = 0;
wmeta->pad_offset = 0;
- WINDOW * test;
- test = newpad(wmeta->padframe.size.y, 1);
- if (NULL == test)
+ WINDOW * pad_test = newpad(wmeta->padframe.size.y, 1);
+ if (NULL == pad_test)
{
return 1;
}
{
return 1;
}
- wmeta->padframe.curses_win = test;
+ wmeta->padframe.curses_win =
pad_
test;
wmeta->active = 0;
return 0;
}
wmeta->active = 0;
return 0;
}