ncurses 6.3 - patch 20220507

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

diff --git a/ncurses/tinfo/alloc_entry.c b/ncurses/tinfo/alloc_entry.c
index 0bc93942ca42a627e96467fc852b1273a708fd3a..10c4fc75cb738e2f8ea3a3a5c5e8109acf3d0499 100644 (file)
--- a/ncurses/tinfo/alloc_entry.c
+++ b/ncurses/tinfo/alloc_entry.c
@@ -48,13 +48,11 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: alloc_entry.c,v 1.68 2022/02/26 22:19:31 tom Exp $")
+MODULE_ID("$Id: alloc_entry.c,v 1.73 2022/05/08 00:11:44 tom Exp $")
 
 #define ABSENT_OFFSET    -1
 #define CANCELLED_OFFSET -2
 
-#define MAX_STRTAB     4096    /* documented maximum entry size */
-
 static char *stringbuf;                /* buffer for string capabilities */
 static size_t next_free;       /* next free character in stringbuf */
 
@@ -62,6 +60,8 @@ NCURSES_EXPORT(void)
 _nc_init_entry(ENTRY * const tp)
 /* initialize a terminal type data block */
 {
+    DEBUG(2, (T_CALLED("_nc_init_entry(tp=%p)"), (void *) tp));
+
     if (tp == NULL) {
 #if NO_LEAKS
        if (stringbuf != NULL) {
@@ -74,23 +74,30 @@ _nc_init_entry(ENTRY * const tp)
     }
 
     if (stringbuf == NULL)
-       TYPE_MALLOC(char, (size_t) MAX_STRTAB, stringbuf);
+       TYPE_CALLOC(char, (size_t) MAX_ENTRY_SIZE, stringbuf);
 
     next_free = 0;
 
     _nc_init_termtype(&(tp->tterm));
+
+    DEBUG(2, (T_RETURN("")));
 }
 
 NCURSES_EXPORT(ENTRY *)
 _nc_copy_entry(ENTRY * oldp)
 {
-    ENTRY *newp = typeCalloc(ENTRY, 1);
+    ENTRY *newp;
 
+    DEBUG(2, (T_CALLED("_nc_copy_entry(oldp=%p)"), (void *) oldp));
+
+    newp = typeCalloc(ENTRY, 1);
     if (newp != NULL) {
        *newp = *oldp;
        _nc_copy_termtype2(&(newp->tterm), &(oldp->tterm));
     }
-    return newp;
+
+    DEBUG(2, (T_RETURN("%p"), (void *) newp));
+    return (newp);
 }
 
 /* save a copy of string in the string buffer */
@@ -111,11 +118,11 @@ _nc_save_str(const char *string)
             * Cheat a little by making an empty string point to the end of the
             * previous string.
             */
-           if (next_free < MAX_STRTAB) {
+           if (next_free < MAX_ENTRY_SIZE) {
                result = (stringbuf + next_free - 1);
            }
-       } else if (next_free + len < MAX_STRTAB) {
-           _nc_STRCPY(&stringbuf[next_free], string, MAX_STRTAB);
+       } else if (next_free + len < MAX_ENTRY_SIZE) {
+           _nc_STRCPY(&stringbuf[next_free], string, MAX_ENTRY_SIZE);
            DEBUG(7, ("Saved string %s", _nc_visbuf(string)));
            DEBUG(7, ("at location %d", (int) next_free));
            next_free += len;
@@ -137,6 +144,8 @@ _nc_wrap_entry(ENTRY * const ep, bool copy_strings)
     unsigned nuses;
     TERMTYPE2 *tp;
 
+    DEBUG(2, (T_CALLED("_nc_wrap_entry(ep=%p, copy_strings=%d)"), (void *)
+             ep, copy_strings));
     if (ep == NULL || stringbuf == NULL)
        _nc_err_abort("_nc_wrap_entry called without initialization");
 
@@ -229,6 +238,7 @@ _nc_wrap_entry(ENTRY * const ep, bool copy_strings)
        else
            ep->uses[i].name = (tp->str_table + useoffsets[i]);
     }
+    DEBUG(2, (T_RETURN("")));
 }
 
 NCURSES_EXPORT(void)