ncurses 5.9 - patch 20121117

[ncurses.git] / ncurses / base / lib_freeall.c

diff --git a/ncurses/base/lib_freeall.c b/ncurses/base/lib_freeall.c
index 38d73aa25204b96a1a3f0598814a2a4cb13dc729..031374924f002cb75159eaef9f4701a995735a6b 100644 (file)
--- a/ncurses/base/lib_freeall.c
+++ b/ncurses/base/lib_freeall.c
@@ -39,7 +39,7 @@
 extern int malloc_errfd;       /* FIXME */
 #endif
 
-MODULE_ID("$Id: lib_freeall.c,v 1.61 2012/08/25 19:52:47 tom Exp $")
+MODULE_ID("$Id: lib_freeall.c,v 1.62 2012/11/17 23:53:03 tom Exp $")
 
 /*
  * Free all ncurses data.  This is used for testing only (there's no practical
@@ -70,19 +70,21 @@ NCURSES_SP_NAME(_nc_freeall) (NCURSES_SP_DCL0)
 
            /* Delete only windows that're not a parent */
            for (each_window(SP_PARM, p)) {
+               WINDOW *p_win = &(p->win);
                bool found = FALSE;
 
                for (each_window(SP_PARM, q)) {
+                   WINDOW *q_win = &(q->win);
                    if ((p != q)
-                       && (q->win._flags & _SUBWIN)
-                       && (&(p->win) == q->win._parent)) {
+                       && (q_win->_flags & _SUBWIN)
+                       && (p_win == q_win->_parent)) {
                        found = TRUE;
                        break;
                    }
                }
 
                if (!found) {
-                   if (delwin(&(p->win)) != ERR)
+                   if (delwin(p_win) != ERR)
                        deleted = TRUE;
                    break;
                }