ncurses 5.5

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

diff --git a/ncurses/tinfo/free_ttype.c b/ncurses/tinfo/free_ttype.c
index b8b9c592037dae13ff9744a287391a72cc65e8a1..2e714e488e8e64765082f6624653fdc928a617cb 100644 (file)
--- a/ncurses/tinfo/free_ttype.c
+++ b/ncurses/tinfo/free_ttype.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1999-2000,2002 Free Software Foundation, Inc.              *
+ * Copyright (c) 1999-2003,2005 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            *
@@ -43,11 +43,43 @@
 #include <tic.h>
 #include <term_entry.h>
 
-MODULE_ID("$Id: free_ttype.c,v 1.8 2002/09/01 20:29:03 tom Exp $")
+MODULE_ID("$Id: free_ttype.c,v 1.11 2005/06/04 21:54:50 tom Exp $")
 
 NCURSES_EXPORT(void)
-_nc_free_termtype(TERMTYPE * ptr)
+_nc_free_termtype(TERMTYPE *ptr)
 {
+    T(("_nc_free_termtype(%s)", ptr->term_names));
+
+    if (ptr->str_table == 0
+       || (ptr->term_names < ptr->str_table
+           || ptr->term_names >= ptr->str_table + MAX_ENTRY_SIZE)) {
+       FreeIfNeeded(ptr->term_names);
+    }
+#if NO_LEAKS
+    else {
+       if (ptr->str_table != 0
+           && (ptr->term_names < ptr->str_table + MAX_ENTRY_SIZE)) {
+           int j;
+           char *last = ptr->str_table;
+           /*
+            * We should have saved the entry-size someplace.  Too late,
+            * but this is useful for the memory-leak checking, though more
+            * work/time than should be in the normal library.
+            */
+           for (j = 0; j < NUM_STRINGS(ptr); j++) {
+               char *s = ptr->Strings[j];
+               if (VALID_STRING(s)) {
+                   char *t = s + strlen(s) + 1;
+                   if (t > last)
+                       last = t;
+               }
+           }
+           if (last < ptr->term_names) {
+               FreeIfNeeded(ptr->term_names);
+           }
+       }
+    }
+#endif
     FreeIfNeeded(ptr->str_table);
     FreeIfNeeded(ptr->Booleans);
     FreeIfNeeded(ptr->Numbers);
@@ -57,6 +89,7 @@ _nc_free_termtype(TERMTYPE * ptr)
     FreeIfNeeded(ptr->ext_Names);
 #endif
     memset(ptr, 0, sizeof(TERMTYPE));
+    _nc_free_entry(_nc_head, ptr);
 }
 
 #if NCURSES_XNAMES
@@ -66,7 +99,9 @@ NCURSES_EXPORT(int)
 use_extended_names(bool flag)
 {
     int oldflag = _nc_user_definable;
+
+    T((T_CALLED("use_extended_names(%d)"), flag));
     _nc_user_definable = flag;
-    return oldflag;
+    returnBool(oldflag);
 }
 #endif