X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=menu%2Fm_items.c;h=539768551d80cff8612d7256eb73f6d2dfcae245;hp=677a01106f8bc7d35f085856cb5cf74a21414109;hb=43f75d22e281b6230678008b72621a76696f45ba;hpb=3a9b6a3bf0269231bef7de74757a910dedd04e0c diff --git a/menu/m_items.c b/menu/m_items.c index 677a0110..53976855 100644 --- a/menu/m_items.c +++ b/menu/m_items.c @@ -1,33 +1,43 @@ -/*-----------------------------------------------------------------------------+ -| The ncurses menu library is Copyright (C) 1995-1997 | -| by Juergen Pfeifer | -| All Rights Reserved. | -| | -| Permission to use, copy, modify, and distribute this software and its | -| documentation for any purpose and without fee is hereby granted, provided | -| that the above copyright notice appear in all copies and that both that | -| copyright notice and this permission notice appear in supporting | -| documentation, and that the name of the above listed copyright holder(s) not | -| be used in advertising or publicity pertaining to distribution of the | -| software without specific, written prior permission. | -| | -| THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD TO | -| THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FIT- | -| NESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR | -| ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RE- | -| SULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, | -| NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH | -| THE USE OR PERFORMANCE OF THIS SOFTWARE. | -+-----------------------------------------------------------------------------*/ +/**************************************************************************** + * Copyright (c) 1998-2005,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 * + * "Software"), to deal in the Software without restriction, including * + * without limitation the rights to use, copy, modify, merge, publish, * + * distribute, distribute with modifications, sublicense, and/or sell * + * copies of the Software, and to permit persons to whom the Software is * + * furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included * + * in all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * + * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * + * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + * * + * Except as contained in this notice, the name(s) of the above copyright * + * holders shall not be used in advertising or otherwise to promote the * + * sale, use or other dealings in this Software without prior written * + * authorization. * + ****************************************************************************/ + +/**************************************************************************** + * Author: Juergen Pfeifer, 1995,1997 * + ****************************************************************************/ /*************************************************************************** -* Module menu_items * +* Module m_items * * Connect and disconnect items to and from menus * ***************************************************************************/ #include "menu.priv.h" -MODULE_ID("$Id: m_items.c,v 1.4 1997/05/01 16:47:26 juergen Exp $") +MODULE_ID("$Id: m_items.c,v 1.17 2010/01/23 21:20:10 tom Exp $") /*--------------------------------------------------------------------------- | Facility : libnmenu @@ -42,38 +52,43 @@ MODULE_ID("$Id: m_items.c,v 1.4 1997/05/01 16:47:26 juergen Exp $") | E_BAD_ARGUMENT - An incorrect menu or item array was | passed to the function +--------------------------------------------------------------------------*/ -int set_menu_items(MENU * menu, ITEM ** items) +NCURSES_EXPORT(int) +set_menu_items(MENU * menu, ITEM ** items) { + T((T_CALLED("set_menu_items(%p,%p)"), (void *)menu, (void *)items)); + if (!menu || (items && !(*items))) RETURN(E_BAD_ARGUMENT); - - if ( menu->status & _POSTED ) + + if (menu->status & _POSTED) RETURN(E_POSTED); - + if (menu->items) _nc_Disconnect_Items(menu); - + if (items) { - if(!_nc_Connect_Items( menu, items )) + if (!_nc_Connect_Items(menu, items)) RETURN(E_CONNECTED); } - + menu->items = items; RETURN(E_OK); -} +} /*--------------------------------------------------------------------------- | Facility : libnmenu | Function : ITEM **menu_items(const MENU *menu) | -| Description : Returns a pointer to the item pointer arry of the menu +| Description : Returns a pointer to the item pointer array of the menu | | Return Values : NULL on error +--------------------------------------------------------------------------*/ -ITEM **menu_items(const MENU *menu) +NCURSES_EXPORT(ITEM **) +menu_items(const MENU * menu) { - return(menu ? menu->items : (ITEM **)0); + T((T_CALLED("menu_items(%p)"), (const void *)menu)); + returnItemPtr(menu ? menu->items : (ITEM **) 0); } /*--------------------------------------------------------------------------- @@ -85,9 +100,11 @@ ITEM **menu_items(const MENU *menu) | | Return Values : Number of items or -1 to indicate error. +--------------------------------------------------------------------------*/ -int item_count(const MENU *menu) +NCURSES_EXPORT(int) +item_count(const MENU * menu) { - return(menu ? menu->nitems : -1); + T((T_CALLED("item_count(%p)"), (const void *)menu)); + returnCode(menu ? menu->nitems : -1); } /* m_items.c ends here */