X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=menu%2Fm_item_nam.c;h=3ed1d37668a29a1809b9e74055e5b52858f8a41b;hp=0a74c6c635c51bd39405e7e4fc1b091b6abc144f;hb=808858ace09b9bf60f7154e33cb6572f49347101;hpb=46722468f47c2b77b3987729b4bcf2321cccfd01 diff --git a/menu/m_item_nam.c b/menu/m_item_nam.c index 0a74c6c6..3ed1d376 100644 --- a/menu/m_item_nam.c +++ b/menu/m_item_nam.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998,2000 Free Software Foundation, Inc. * + * Copyright (c) 1998-2004,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 * @@ -28,7 +28,6 @@ /**************************************************************************** * Author: Juergen Pfeifer, 1995,1997 * - * Contact: http://www.familiepfeifer.de/Contact.aspx?Lang=en * ****************************************************************************/ /*************************************************************************** @@ -38,7 +37,7 @@ #include "menu.priv.h" -MODULE_ID("$Id: m_item_nam.c,v 1.11 2002/07/06 15:22:16 juergen Exp $") +MODULE_ID("$Id: m_item_nam.c,v 1.15 2010/01/23 21:20:10 tom Exp $") /*--------------------------------------------------------------------------- | Facility : libnmenu @@ -49,11 +48,12 @@ MODULE_ID("$Id: m_item_nam.c,v 1.11 2002/07/06 15:22:16 juergen Exp $") | Return Values : See above; returns NULL if item is invalid +--------------------------------------------------------------------------*/ NCURSES_EXPORT(const char *) -item_name (const ITEM * item) +item_name(const ITEM * item) { - return ((item) ? item->name.str : (char *)0); + T((T_CALLED("item_name(%p)"), (const void *)item)); + returnCPtr((item) ? item->name.str : (char *)0); } - + /*--------------------------------------------------------------------------- | Facility : libnmenu | Function : char *item_description(const ITEM *item) @@ -63,9 +63,10 @@ item_name (const ITEM * item) | Return Values : See above; Returns NULL if item is invalid +--------------------------------------------------------------------------*/ NCURSES_EXPORT(const char *) -item_description (const ITEM * item) +item_description(const ITEM * item) { - return ((item) ? item->description.str : (char *)0); + T((T_CALLED("item_description(%p)"), (const void *)item)); + returnCPtr((item) ? item->description.str : (char *)0); } /* m_item_nam.c ends here */