ncurses 5.7 - patch 20090221

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

diff --git a/ncurses/base/lib_freeall.c b/ncurses/base/lib_freeall.c
index b06123d2593fa09288fe93beeea1987dc54ca115..61991816361424d739cdd8f26ce1c13db5914194 100644 (file)
--- a/ncurses/base/lib_freeall.c
+++ b/ncurses/base/lib_freeall.c
@@ -40,7 +40,7 @@
 extern int malloc_errfd;       /* FIXME */
 #endif
 
-MODULE_ID("$Id: lib_freeall.c,v 1.49 2008/06/21 21:26:33 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,6 +58,9 @@ _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) {
@@ -95,14 +98,14 @@ _nc_freeall(void)
        delscreen(SP);
        _nc_unlock_global(curses);
     }
-    if (cur_term != 0)
-       del_curterm(cur_term);
 
     (void) _nc_printf_string(0, empty_va);
 #ifdef TRACE
     (void) _nc_trace_buf(-1, 0);
 #endif
-
+#if USE_WIDEC_SUPPORT
+    FreeIfNeeded(_nc_wacs);
+#endif
     _nc_leaks_tinfo();
 
 #if HAVE_LIBDBMALLOC
@@ -124,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);
@@ -136,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