/****************************************************************************
- * Copyright (c) 1999,2000 Free Software Foundation, Inc. *
+ * Copyright (c) 1999-2002,2003 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 *
* Author: Thomas E. Dickey <dickey@clark.net> 1999 *
****************************************************************************/
-
/*
* free_ttype.c -- allocation functions for TERMTYPE
*
#include <tic.h>
#include <term_entry.h>
-MODULE_ID("$Id: free_ttype.c,v 1.5 2000/07/08 00:43:58 tom Exp $")
+MODULE_ID("$Id: free_ttype.c,v 1.10 2003/08/09 21:22:03 tom Exp $")
-void _nc_free_termtype(TERMTYPE *ptr)
+NCURSES_EXPORT(void)
+_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->term_names);
FreeIfNeeded(ptr->Booleans);
FreeIfNeeded(ptr->Numbers);
FreeIfNeeded(ptr->Strings);
}
#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;
+
+ T((T_CALLED("use_extended_names(%d)"), flag));
_nc_user_definable = flag;
- return oldflag;
+ returnBool(oldflag);
}
#endif