X-Git-Url: https://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=ncurses%2Ftinfo%2Falloc_entry.c;h=10c4fc75cb738e2f8ea3a3a5c5e8109acf3d0499;hb=f8401f5e8669eadd551fde12da7de661c18fa4f2;hp=aed7394362a9f6672b9f824ecf11372501405700;hpb=4c9f63c460cb7134f142aa65f6866c175ed77605;p=ncurses.git diff --git a/ncurses/tinfo/alloc_entry.c b/ncurses/tinfo/alloc_entry.c index aed73943..10c4fc75 100644 --- a/ncurses/tinfo/alloc_entry.c +++ b/ncurses/tinfo/alloc_entry.c @@ -48,7 +48,7 @@ #include -MODULE_ID("$Id: alloc_entry.c,v 1.69 2022/04/16 22:46:53 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 @@ -60,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) { @@ -72,23 +74,30 @@ _nc_init_entry(ENTRY * const tp) } if (stringbuf == NULL) - TYPE_MALLOC(char, (size_t) MAX_ENTRY_SIZE, 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 */ @@ -135,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"); @@ -227,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)