ncurses 6.0 - patch 20171118

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

diff --git a/ncurses/tinfo/free_ttype.c b/ncurses/tinfo/free_ttype.c
index 2e714e488e8e64765082f6624653fdc928a617cb..351cda933c7539347c08e1cceadfb36e0ddb3620 100644 (file)
--- a/ncurses/tinfo/free_ttype.c
+++ b/ncurses/tinfo/free_ttype.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1999-2003,2005 Free Software Foundation, Inc.              *
+ * Copyright (c) 1999-2011,2017 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -27,7 +27,7 @@
  ****************************************************************************/
 
 /****************************************************************************
  ****************************************************************************/
 
 /****************************************************************************

- *  Author: Thomas E. Dickey <dickey@clark.net> 1999                        *
+ *  Author: Thomas E. Dickey                    1999-on                     *

  ****************************************************************************/
 
 /*
  ****************************************************************************/
 
 /*


@@ -41,57 +41,47 @@
 #include <curses.priv.h>
 
 #include <tic.h>
 #include <curses.priv.h>
 
 #include <tic.h>

-#include <term_entry.h>

 
 

-MODULE_ID("$Id: free_ttype.c,v 1.11 2005/06/04 21:54:50 tom Exp $")
+MODULE_ID("$Id: free_ttype.c,v 1.17 2017/04/13 01:06:04 tom Exp $")

 
 

-NCURSES_EXPORT(void)
-_nc_free_termtype(TERMTYPE *ptr)
+static void
+really_free_termtype(TERMTYPE2 *ptr, bool freeStrings)

 {
     T(("_nc_free_termtype(%s)", ptr->term_names));
 
 {
     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);
-           }
-       }
+    if (freeStrings) {
+       FreeIfNeeded(ptr->str_table);

     }
     }

-#endif
-    FreeIfNeeded(ptr->str_table);

     FreeIfNeeded(ptr->Booleans);
     FreeIfNeeded(ptr->Numbers);
     FreeIfNeeded(ptr->Strings);
 #if NCURSES_XNAMES
     FreeIfNeeded(ptr->Booleans);
     FreeIfNeeded(ptr->Numbers);
     FreeIfNeeded(ptr->Strings);
 #if NCURSES_XNAMES

-    FreeIfNeeded(ptr->ext_str_table);
+    if (freeStrings) {
+       FreeIfNeeded(ptr->ext_str_table);
+    }

     FreeIfNeeded(ptr->ext_Names);
 #endif
     memset(ptr, 0, sizeof(TERMTYPE));
     _nc_free_entry(_nc_head, ptr);
 }
 
     FreeIfNeeded(ptr->ext_Names);
 #endif
     memset(ptr, 0, sizeof(TERMTYPE));
     _nc_free_entry(_nc_head, ptr);
 }
 

+/*
+ * This entrypoint is used by tack.
+ */
+NCURSES_EXPORT(void)
+_nc_free_termtype(TERMTYPE *ptr)
+{
+    really_free_termtype((TERMTYPE2 *) ptr, !NCURSES_EXT_NUMBERS);
+}
+
+#if NCURSES_EXT_NUMBERS
+NCURSES_EXPORT(void)
+_nc_free_termtype2(TERMTYPE2 *ptr)
+{
+    really_free_termtype(ptr, TRUE);
+}
+#endif
+

 #if NCURSES_XNAMES
 NCURSES_EXPORT_VAR(bool) _nc_user_definable = TRUE;
 
 #if NCURSES_XNAMES
 NCURSES_EXPORT_VAR(bool) _nc_user_definable = TRUE;
 


@@ -100,6 +90,7 @@ use_extended_names(bool flag)
 {
     int oldflag = _nc_user_definable;
 
 {
     int oldflag = _nc_user_definable;
 

+    START_TRACE();

     T((T_CALLED("use_extended_names(%d)"), flag));
     _nc_user_definable = flag;
     returnBool(oldflag);
     T((T_CALLED("use_extended_names(%d)"), flag));
     _nc_user_definable = flag;
     returnBool(oldflag);