X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=menu%2Fm_new.c;h=cf89196abd833bc4f7691c8c11c4f75ff5c825b8;hp=6068dc611b02ef7a5c08cdfb30290efc50aaafa3;hb=2db461ea0b1b29c142e3000d830b520c946e385b;hpb=fc79b49bd8a9c5e4db287514cdac46e1691cf48a;ds=inline diff --git a/menu/m_new.c b/menu/m_new.c index 6068dc61..cf89196a 100644 --- a/menu/m_new.c +++ b/menu/m_new.c @@ -1,5 +1,6 @@ /**************************************************************************** - * Copyright (c) 1998-2006,2009 Free Software Foundation, Inc. * + * Copyright 2020 Thomas E. Dickey * + * Copyright 1998-2009,2010 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 * @@ -37,7 +38,7 @@ #include "menu.priv.h" -MODULE_ID("$Id: m_new.c,v 1.19 2009/04/05 00:32:13 tom Exp $") +MODULE_ID("$Id: m_new.c,v 1.22 2020/02/02 23:34:34 tom Exp $") /*--------------------------------------------------------------------------- | Facility : libnmenu @@ -54,9 +55,9 @@ NCURSES_EXPORT(MENU *) NCURSES_SP_NAME(new_menu) (NCURSES_SP_DCLx ITEM ** items) { int err = E_SYSTEM_ERROR; - MENU *menu = (MENU *) calloc(1, sizeof(MENU)); + MENU *menu = typeCalloc(MENU, 1); - T((T_CALLED("new_menu(%p,%p)"), SP_PARM, items)); + T((T_CALLED("new_menu(%p,%p)"), (void *)SP_PARM, (void *)items)); if (menu) { *menu = _nc_Default_Menu; @@ -122,7 +123,7 @@ new_menu(ITEM ** items) NCURSES_EXPORT(int) free_menu(MENU * menu) { - T((T_CALLED("free_menu(%p)"), menu)); + T((T_CALLED("free_menu(%p)"), (void *)menu)); if (!menu) RETURN(E_BAD_ARGUMENT);