ncurses 5.6 - patch 20080830

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

diff --git a/ncurses/base/lib_delwin.c b/ncurses/base/lib_delwin.c
index fc68f9d68deeef6f3f7d1065e0151947ceb53a9f..b92c403359584a220126716946a110cd927d671f 100644 (file)
--- a/ncurses/base/lib_delwin.c
+++ b/ncurses/base/lib_delwin.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2001,2007 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2007,2008 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            *
@@ -40,7 +40,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_delwin.c,v 1.15 2007/12/22 23:34:26 tom Exp $")
+MODULE_ID("$Id: lib_delwin.c,v 1.17 2008/06/07 14:10:56 tom Exp $")
 
 static bool
 cannot_delete(WINDOW *win)
@@ -48,7 +48,7 @@ cannot_delete(WINDOW *win)
     WINDOWLIST *p;
     bool result = TRUE;
 
-    for (p = _nc_windows; p != 0; p = p->next) {
+    for (each_window(p)) {
        if (&(p->win) == win) {
            result = FALSE;
        } else if ((p->win._flags & _SUBWIN) != 0
@@ -67,12 +67,10 @@ delwin(WINDOW *win)
 
     T((T_CALLED("delwin(%p)"), win));
 
-    if (_nc_try_global(windowlist) == 0) {
-       _nc_lock_window(win);
+    if (_nc_try_global(curses) == 0) {
        if (win == 0
            || cannot_delete(win)) {
            result = ERR;
-           _nc_unlock_window(win);
        } else {
 
            if (win->_flags & _SUBWIN)
@@ -80,10 +78,9 @@ delwin(WINDOW *win)
            else if (curscr != 0)
                touchwin(curscr);
 
-           _nc_unlock_window(win);
            result = _nc_freewin(win);
        }
-       _nc_unlock_global(windowlist);
+       _nc_unlock_global(curses);
     }
     returnCode(result);
 }