ncurses 5.6 - patch 20071201

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

diff --git a/ncurses/base/lib_delwin.c b/ncurses/base/lib_delwin.c
index 89d8e7c32ece398bb1126cc7e685ccc82429fdce..e16f7878b6ce93649cbe2bf6f6d087bef00e3218 100644 (file)
--- a/ncurses/base/lib_delwin.c
+++ b/ncurses/base/lib_delwin.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998,2000,2001 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2001,2007 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            *
  *                                                                          *
  * 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>
 
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_delwin.c,v 1.13 2001/08/26 00:40:20 tom Exp $")
+MODULE_ID("$Id: lib_delwin.c,v 1.14 2007/11/03 20:24:15 tom Exp $")

 
 static bool
 cannot_delete(WINDOW *win)
 
 static bool
 cannot_delete(WINDOW *win)


@@ -63,16 +63,23 @@ cannot_delete(WINDOW *win)
 NCURSES_EXPORT(int)
 delwin(WINDOW *win)
 {
 NCURSES_EXPORT(int)
 delwin(WINDOW *win)
 {

+    int result = ERR;
+

     T((T_CALLED("delwin(%p)"), win));
 
     T((T_CALLED("delwin(%p)"), win));
 

+    _nc_lock_global(windowlist);

     if (win == 0
     if (win == 0

-       || cannot_delete(win))
-       returnCode(ERR);
+       || cannot_delete(win)) {
+       result = ERR;
+    } else {

 
 

-    if (win->_flags & _SUBWIN)
-       touchwin(win->_parent);
-    else if (curscr != 0)
-       touchwin(curscr);
+       if (win->_flags & _SUBWIN)
+           touchwin(win->_parent);
+       else if (curscr != 0)
+           touchwin(curscr);

 
 

-    returnCode(_nc_freewin(win));
+       result = _nc_freewin(win);
+    }
+    _nc_unlock_global(windowlist);
+    returnCode(result);

 }
 }