ncurses 5.3

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

diff --git a/ncurses/base/lib_freeall.c b/ncurses/base/lib_freeall.c
index 28f0e5f9f425d0d889d7b030cc29ab6e6ee42833..bce0a73ef30faedbaf0e8b8e4df0d9ebd881a381 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-2001,2002 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,40 +39,17 @@
 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.20 2002/07/28 00:35:25 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;
 
 #if NO_LEAKS
     _nc_free_tparm();
@@ -85,34 +62,29 @@ _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);
     }
+
+    if ((s = _nc_home_terminfo()) != 0)
+       free(s);
 #ifdef TRACE
     (void) _nc_trace_buf(-1, 0);
 #endif
@@ -124,7 +96,7 @@ _nc_freeall(void)
 #endif
 }
 
-void
+NCURSES_EXPORT(void)
 _nc_free_and_exit(int code)
 {
     _nc_freeall();
@@ -132,7 +104,7 @@ _nc_free_and_exit(int code)
 }
 
 #else
-void
+NCURSES_EXPORT(void)
 _nc_freeall(void)
 {
 }