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

curses: change from malloc() to nethack's alloc()

Browse Source 
There was no provision for malloc() potentially returning Null and it
wasn't integrated with nethack's MONITOR_HEAP.  'heaputil' shows that
the curses interface is leaking like a sieve.  If some things are
actually being allocated separately and then freed from within curses,
those need to be thoroughly documented and maybe switched back to
malloc().
This commit is contained in:
PatR
2019-02-07 16:48:37 -08:00
parent b1de94f922
commit 19d737951e
5 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win/curses/curswins.c
+20 -11
View File
@@ -79,7 +79,8 @@ curses_create_window(int width, int height, orient orientation)
height += 2;
if ((width > term_cols) || (height > term_rows)) {
impossible("curses_create_window: Terminal too small for dialog window");
impossible(
"curses_create_window: Terminal too small for dialog window");
width = term_cols;
height = term_rows;
}
@@ -193,7 +194,8 @@ WINDOW *
curses_get_nhwin(winid wid)
{
if (!is_main_window(wid)) {
impossible("curses_get_nhwin: wid %d out of range. Not a main window.", wid);
impossible("curses_get_nhwin: wid %d out of range. Not a main window.",
wid);
return NULL;
}
@@ -212,7 +214,8 @@ curses_add_nhwin(winid wid, int height, int width, int y, int x,
int real_height = height;
if (!is_main_window(wid)) {
impossible("curses_add_nhwin: wid %d out of range. Not a main window.", wid);
impossible("curses_add_nhwin: wid %d out of range. Not a main window.",
wid);
return;
}
@@ -266,7 +269,7 @@ curses_add_wid(winid wid)
nethack_wid *new_wid;
nethack_wid *widptr = nhwids;
new_wid = malloc(sizeof (nethack_wid));
new_wid = (nethack_wid *) alloc((unsigned) sizeof (nethack_wid));
new_wid->nhwid = wid;
new_wid->next_wid = NULL;
@@ -305,7 +308,8 @@ curses_del_nhwin(winid wid)
}
if (!is_main_window(wid)) {
impossible("curses_del_nhwin: wid %d out of range. Not a main window.", wid);
impossible("curses_del_nhwin: wid %d out of range. Not a main window.",
wid);
return;
}
@@ -396,7 +400,9 @@ void
curses_get_window_xy(winid wid, int *x, int *y)
{
if (!is_main_window(wid)) {
impossible("curses_get_window_xy: wid %d out of range. Not a main window.", wid);
impossible(
"curses_get_window_xy: wid %d out of range. Not a main window.",
wid);
*x = 0;
*y = 0;
return;
@@ -451,8 +457,9 @@ int
curses_get_window_orientation(winid wid)
{
if (!is_main_window(wid)) {
impossible
("curses_get_window_orientation: wid %d out of range. Not a main window.", wid);
impossible(
"curses_get_window_orientation: wid %d out of range. Not a main window.",
wid);
return CENTER;
}
@@ -461,7 +468,7 @@ curses_get_window_orientation(winid wid)
/* Output a line of text to specified NetHack window with given coordinates
and text attributes */
and text attributes */
void
curses_puts(winid wid, int attr, const char *text)
@@ -490,10 +497,12 @@ curses_puts(winid wid, int attr, const char *text)
if (curses_is_menu(wid) || curses_is_text(wid)) {
if (!curses_menu_exists(wid)) {
impossible("curses_puts: Attempted write to nonexistant window %d!", wid);
impossible(
"curses_puts: Attempted write to nonexistant window %d!",
wid);
return;
}
identifier = malloc(sizeof (anything));
identifier = (anything *) alloc((unsigned) sizeof (anything));
identifier->a_void = NULL;
curses_add_nhmenu_item(wid, NO_GLYPH, identifier, 0, 0, attr, text,
FALSE);