X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Flib_freeall.c;h=61991816361424d739cdd8f26ce1c13db5914194;hp=dbf0483f24016d8f4532077f8f1396d18449a2f5;hb=b94faec6aab7c3613c1e7d217f6df6f42d929234;hpb=e0371a7943009d611a4dc080dcddfcdfba9f589b

diff --git a/ncurses/base/lib_freeall.c b/ncurses/base/lib_freeall.c
index dbf0483f..61991816 100644
--- a/ncurses/base/lib_freeall.c
+++ b/ncurses/base/lib_freeall.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2006,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 @@
 extern int malloc_errfd;	/* FIXME */
 #endif
 
-MODULE_ID("$Id: lib_freeall.c,v 1.45 2007/12/22 23:29:37 tom Exp $")
+MODULE_ID("$Id: lib_freeall.c,v 1.55 2008/12/06 23:52:29 tom Exp $")
 
 /*
  * Free all ncurses data.  This is used for testing only (there's no practical
@@ -58,19 +58,22 @@ _nc_freeall(void)
 	if (SP->_oldnum_list != 0) {
 	    FreeAndNull(SP->_oldnum_list);
 	}
+	if (SP->_panelHook.destroy != 0) {
+	    SP->_panelHook.destroy(SP->_panelHook.stdscr_pseudo_panel);
+	}
     }
 #endif
     if (SP != 0) {
-	_nc_lock_global(windowlist);
+	_nc_lock_global(curses);
 
 	while (_nc_windows != 0) {
 	    bool deleted = FALSE;
 
 	    /* Delete only windows that're not a parent */
-	    for (p = _nc_windows; p != 0; p = p->next) {
+	    for (each_window(p)) {
 		bool found = FALSE;
 
-		for (q = _nc_windows; q != 0; q = q->next) {
+		for (each_window(q)) {
 		    if ((p != q)
 			&& (q->win._flags & _SUBWIN)
 			&& (&(p->win) == q->win._parent)) {
@@ -93,23 +96,16 @@ _nc_freeall(void)
 		break;
 	}
 	delscreen(SP);
-	_nc_unlock_global(windowlist);
+	_nc_unlock_global(curses);
     }
-    if (cur_term != 0)
-	del_curterm(cur_term);
 
-#if USE_WIDEC_SUPPORT
-    FreeIfNeeded(_nc_wacs);
-#endif
     (void) _nc_printf_string(0, empty_va);
 #ifdef TRACE
     (void) _nc_trace_buf(-1, 0);
 #endif
-
-#if BROKEN_LINKER || USE_REENTRANT
-    FreeIfNeeded(_nc_prescreen.real_acs_map);
+#if USE_WIDEC_SUPPORT
+    FreeIfNeeded(_nc_wacs);
 #endif
-
     _nc_leaks_tinfo();
 
 #if HAVE_LIBDBMALLOC
@@ -131,7 +127,10 @@ _nc_free_and_exit(int code)
     _nc_freeall();
 #ifdef TRACE
     trace(0);			/* close trace file, freeing its setbuf */
-    free(_nc_varargs("?", 0));
+    {
+	static va_list fake;
+	free(_nc_varargs("?", fake));
+    }
 #endif
     fclose(stdout);
     FreeIfNeeded(last_setbuf);
@@ -143,4 +142,14 @@ NCURSES_EXPORT(void)
 _nc_freeall(void)
 {
 }
+
+NCURSES_EXPORT(void)
+_nc_free_and_exit(int code)
+{
+    if (SP)
+	delscreen(SP);
+    if (cur_term != 0)
+	del_curterm(cur_term);
+    exit(code);
+}
 #endif