X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=menu%2Fm_new.c;h=be175581ba193f3924d61159419353a0a6c9e838;hp=c1133896b6645d271e787d9a51102f1e7877b673;hb=9f479192e3ca3413d235c66bf058f8cc63764898;hpb=04d942c3d98cf0a929c6afb17be8c10d4ae39af0 diff --git a/menu/m_new.c b/menu/m_new.c index c1133896..be175581 100644 --- a/menu/m_new.c +++ b/menu/m_new.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2021 Thomas E. Dickey * * Copyright 1998-2009,2010 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -38,12 +38,12 @@ #include "menu.priv.h" -MODULE_ID("$Id: m_new.c,v 1.23 2020/05/24 01:40:20 anonymous.maarten Exp $") +MODULE_ID("$Id: m_new.c,v 1.27 2021/06/17 21:26:02 tom Exp $") /*--------------------------------------------------------------------------- -| Facility : libnmenu +| Facility : libnmenu | Function : MENU* _nc_new_menu(SCREEN*, ITEM **items) -| +| | Description : Creates a new menu connected to the item pointer | array items and returns a pointer to the new menu. | The new menu is initialized with the values from the @@ -52,7 +52,7 @@ MODULE_ID("$Id: m_new.c,v 1.23 2020/05/24 01:40:20 anonymous.maarten Exp $") | Return Values : NULL on error +--------------------------------------------------------------------------*/ MENU_EXPORT(MENU *) -NCURSES_SP_NAME(new_menu) (NCURSES_SP_DCLx ITEM ** items) +NCURSES_SP_NAME(new_menu) (NCURSES_SP_DCLx ITEM **items) { int err = E_SYSTEM_ERROR; MENU *menu = typeCalloc(MENU, 1); @@ -60,6 +60,7 @@ NCURSES_SP_NAME(new_menu) (NCURSES_SP_DCLx ITEM ** items) T((T_CALLED("new_menu(%p,%p)"), (void *)SP_PARM, (void *)items)); if (menu) { + T((T_CREATE("menu %p"), (void *)menu)); *menu = _nc_Default_Menu; menu->status = 0; menu->rows = menu->frows; @@ -77,7 +78,7 @@ NCURSES_SP_NAME(new_menu) (NCURSES_SP_DCLx ITEM ** items) { err = E_NOT_CONNECTED; free(menu); - menu = (MENU *) 0; + menu = (MENU *)0; } else err = E_OK; @@ -91,9 +92,9 @@ NCURSES_SP_NAME(new_menu) (NCURSES_SP_DCLx ITEM ** items) } /*--------------------------------------------------------------------------- -| Facility : libnmenu +| Facility : libnmenu | Function : MENU *new_menu(ITEM **items) -| +| | Description : Creates a new menu connected to the item pointer | array items and returns a pointer to the new menu. | The new menu is initialized with the values from the @@ -103,17 +104,17 @@ NCURSES_SP_NAME(new_menu) (NCURSES_SP_DCLx ITEM ** items) +--------------------------------------------------------------------------*/ #if NCURSES_SP_FUNCS MENU_EXPORT(MENU *) -new_menu(ITEM ** items) +new_menu(ITEM **items) { return NCURSES_SP_NAME(new_menu) (CURRENT_SCREEN, items); } #endif /*--------------------------------------------------------------------------- -| Facility : libnmenu -| Function : int free_menu(MENU *menu) -| -| Description : Disconnects menu from its associated item pointer +| Facility : libnmenu +| Function : int free_menu(MENU *menu) +| +| Description : Disconnects menu from its associated item pointer | array and frees the storage allocated for the menu. | | Return Values : E_OK - success @@ -121,7 +122,7 @@ new_menu(ITEM ** items) | E_POSTED - Menu is already posted +--------------------------------------------------------------------------*/ MENU_EXPORT(int) -free_menu(MENU * menu) +free_menu(MENU *menu) { T((T_CALLED("free_menu(%p)"), (void *)menu)); if (!menu)