ncurses 5.9 - patch 20111126

[ncurses.git] / ncurses / tinfo / entries.c

diff --git a/ncurses/tinfo/entries.c b/ncurses/tinfo/entries.c
index dd4286ce3e7d4287b5f2c6062e5d2d2a1bc8555c..30981e5c8058b4002103a897429dfd183d46072d 100644 (file)
--- a/ncurses/tinfo/entries.c
+++ b/ncurses/tinfo/entries.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2006-2008,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 2006-2010,2011 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            *
@@ -28,6 +28,7 @@
 
 /****************************************************************************
  *  Author: Thomas E. Dickey                                                *
+ *     and: Juergen Pfeifer                                                 *
  ****************************************************************************/
 
 #include <curses.priv.h>
@@ -35,9 +36,8 @@
 #include <ctype.h>
 
 #include <tic.h>
-#include <term_entry.h>
 
-MODULE_ID("$Id: entries.c,v 1.11 2009/03/14 15:22:37 tom Exp $")
+MODULE_ID("$Id: entries.c,v 1.19 2011/10/22 16:34:50 tom Exp $")
 
 /****************************************************************************
  *
@@ -120,12 +120,15 @@ _nc_leaks_tinfo(void)
     _nc_free_tparm();
     _nc_tgetent_leaks();
 
-    if (cur_term != 0)
-       del_curterm(cur_term);
+    if (TerminalOf(CURRENT_SCREEN) != 0) {
+       del_curterm(TerminalOf(CURRENT_SCREEN));
+    }
 
+    _nc_comp_captab_leaks();
     _nc_free_entries(_nc_head);
     _nc_get_type(0);
     _nc_first_name(0);
+    _nc_db_iterator_leaks();
     _nc_keyname_leaks();
 #if BROKEN_LINKER || USE_REENTRANT
     _nc_names_leaks();
@@ -135,6 +138,12 @@ _nc_leaks_tinfo(void)
 
     if ((s = _nc_home_terminfo()) != 0)
        free(s);
+
+#ifdef TRACE
+    trace(0);
+    _nc_trace_buf(-1, (size_t) 0);
+#endif
+
 #endif /* NO_LEAKS */
     returnVoid;
 }