ncurses 5.4

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

diff --git a/ncurses/base/lib_freeall.c b/ncurses/base/lib_freeall.c
index 28f0e5f9f425d0d889d7b030cc29ab6e6ee42833..607d3495847213d1f11965d390e4928bf94c5365 100644 (file)
--- a/ncurses/base/lib_freeall.c
+++ b/ncurses/base/lib_freeall.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998,1999 Free Software Foundation, Inc.                   *
+ * Copyright (c) 1998-2002,2003 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            *
@@ -39,43 +39,22 @@
 extern int malloc_errfd;       /* FIXME */
 #endif
 
-MODULE_ID("$Id: lib_freeall.c,v 1.16 1999/11/28 01:34:11 tom Exp $")
-
-static void
-free_slk(SLK *p)
-{
-    if (p != 0) {
-       FreeIfNeeded(p->ent);
-       FreeIfNeeded(p->buffer);
-       free(p);
-    }
-}
-
-static void
-free_tries(struct tries *p)
-{
-    struct tries *q;
-
-    while (p != 0) {
-       q = p->sibling;
-       if (p->child != 0)
-           free_tries(p->child);
-       free(p);
-       p = q;
-    }
-}
+MODULE_ID("$Id: lib_freeall.c,v 1.26 2003/12/27 18:21:57 tom Exp $")
 
 /*
  * Free all ncurses data.  This is used for testing only (there's no practical
  * use for it as an extension).
  */
-void
+NCURSES_EXPORT(void)
 _nc_freeall(void)
 {
     WINDOWLIST *p, *q;
+    char *s;
 
+    T((T_CALLED("_nc_freeall()")));
 #if NO_LEAKS
     _nc_free_tparm();
+    FreeAndNull(_nc_oldnums);
 #endif
     if (SP != 0) {
        while (_nc_windows != 0) {
@@ -85,54 +64,59 @@ _nc_freeall(void)
 
                for (q = _nc_windows; q != 0; q = q->next) {
                    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) {
-                   delwin(p->win);
+                   delwin(&(p->win));
                    break;
                }
            }
        }
-
-       free_tries(SP->_keytry);
-       free_tries(SP->_key_ok);
-       free_slk(SP->_slk);
-       FreeIfNeeded(SP->_color_pairs);
-       FreeIfNeeded(SP->_color_table);
-#if !BROKEN_LINKER
-       FreeAndNull(SP);
-#endif
+       delscreen(SP);
     }
 
-    if (cur_term != 0) {
-       _nc_free_termtype(&(cur_term->type));
-       free(cur_term);
-    }
+    del_curterm(cur_term);
+    _nc_free_entries(_nc_head);
+
+    if ((s = _nc_home_terminfo()) != 0)
+       free(s);
+
+    (void) _nc_printf_string(0, 0);
 #ifdef TRACE
     (void) _nc_trace_buf(-1, 0);
 #endif
+
 #if HAVE_LIBDBMALLOC
     malloc_dump(malloc_errfd);
 #elif HAVE_LIBDMALLOC
 #elif HAVE_PURIFY
     purify_all_inuse();
 #endif
+    returnVoid;
 }
 
-void
+NCURSES_EXPORT(void)
 _nc_free_and_exit(int code)
 {
+    char *last_setbuf = (SP != 0) ? SP->_setbuf : 0;
+
     _nc_freeall();
+#ifdef TRACE
+    trace(0);                  /* close trace file, freeing its setbuf */
+    free(_nc_varargs("?", 0));
+#endif
+    fclose(stdout);
+    FreeIfNeeded(last_setbuf);
     exit(code);
 }
 
 #else
-void
+NCURSES_EXPORT(void)
 _nc_freeall(void)
 {
 }