X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Ftinfo%2Fentries.c;h=f7db6619ede2c251e342f16a23c8ef7c7a51628c;hp=746d69a38c6ece5ba835f717aaaf1e67c0a24274;hb=a5c5f83f5704909b0fcbfc2668d664cded977ff8;hpb=d4ede7c5fa6a269d338fea32cd93bf39083dda8c

diff --git a/ncurses/tinfo/entries.c b/ncurses/tinfo/entries.c
index 746d69a3..f7db6619 100644
--- 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-2011,2012 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            *
@@ -36,9 +36,8 @@
 #include <ctype.h>
 
 #include <tic.h>
-#include <term_entry.h>
 
-MODULE_ID("$Id: entries.c,v 1.12 2009/06/06 18:54:42 tom Exp $")
+MODULE_ID("$Id: entries.c,v 1.20 2012/02/22 09:37:02 tom Exp $")
 
 /****************************************************************************
  *
@@ -121,21 +120,31 @@ _nc_leaks_tinfo(void)
     _nc_free_tparm();
     _nc_tgetent_leaks();
 
-    if (HasTerminal(CURRENT_SCREEN))
+    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();
     _nc_codes_leaks();
     FreeIfNeeded(_nc_prescreen.real_acs_map);
 #endif
+    _nc_comp_error_leaks();
 
     if ((s = _nc_home_terminfo()) != 0)
 	free(s);
+
+#ifdef TRACE
+    trace(0);
+    _nc_trace_buf(-1, (size_t) 0);
+#endif
+
 #endif /* NO_LEAKS */
     returnVoid;
 }