ncurses 5.9 - patch 20120721

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

diff --git a/ncurses/tinfo/free_ttype.c b/ncurses/tinfo/free_ttype.c
index 203ec89ed35961dd1fd025bff2f229be64764931..ad056ba4545b55feb9d9254ff17fe30f970d0aeb 100644 (file)
--- a/ncurses/tinfo/free_ttype.c
+++ b/ncurses/tinfo/free_ttype.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1999 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1999-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            *
@@ -27,10 +27,9 @@
  ****************************************************************************/
 
 /****************************************************************************
- *  Author: Thomas E. Dickey <dickey@clark.net> 1999                        *
+ *  Author: Thomas E. Dickey                    1999-on                     *
  ****************************************************************************/
 
-
 /*
  * free_ttype.c -- allocation functions for TERMTYPE
  *
@@ -42,31 +41,37 @@
 #include <curses.priv.h>
 
 #include <tic.h>
-#include <term_entry.h>
 
-MODULE_ID("$Id: free_ttype.c,v 1.2 1999/03/01 00:30:35 tom Exp $")
+MODULE_ID("$Id: free_ttype.c,v 1.15 2011/02/06 01:08:31 tom Exp $")
 
-void _nc_free_termtype(TERMTYPE *ptr)
+NCURSES_EXPORT(void)
+_nc_free_termtype(TERMTYPE *ptr)
 {
-       FreeIfNeeded(ptr->str_table);
-       FreeIfNeeded(ptr->term_names);
+    T(("_nc_free_termtype(%s)", ptr->term_names));
+
+    FreeIfNeeded(ptr->str_table);
+    FreeIfNeeded(ptr->Booleans);
+    FreeIfNeeded(ptr->Numbers);
+    FreeIfNeeded(ptr->Strings);
 #if NCURSES_XNAMES
-       FreeIfNeeded(ptr->ext_str_table);
-       FreeIfNeeded(ptr->Booleans);
-       FreeIfNeeded(ptr->Numbers);
-       FreeIfNeeded(ptr->Strings);
-       FreeIfNeeded(ptr->ext_Names);
+    FreeIfNeeded(ptr->ext_str_table);
+    FreeIfNeeded(ptr->ext_Names);
 #endif
-       memset(ptr, 0, sizeof(TERMTYPE));
+    memset(ptr, 0, sizeof(TERMTYPE));
+    _nc_free_entry(_nc_head, ptr);
 }
 
 #if NCURSES_XNAMES
-bool _nc_user_definable = TRUE;
+NCURSES_EXPORT_VAR(bool) _nc_user_definable = TRUE;
 
-int use_extended_names(bool flag)
+NCURSES_EXPORT(int)
+use_extended_names(bool flag)
 {
-       int oldflag = _nc_user_definable;
-       _nc_user_definable = flag;
-       return oldflag;
+    int oldflag = _nc_user_definable;
+
+    START_TRACE();
+    T((T_CALLED("use_extended_names(%d)"), flag));
+    _nc_user_definable = flag;
+    returnBool(oldflag);
 }
 #endif