X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=menu%2Fm_items.c;h=539768551d80cff8612d7256eb73f6d2dfcae245;hp=54459e75ad9d9bc8b184466e301ea2ce0e55a96f;hb=71c0306f0824ef2b10c4c5813fb003db48f3012e;hpb=46722468f47c2b77b3987729b4bcf2321cccfd01

diff --git a/menu/m_items.c b/menu/m_items.c
index 54459e75..53976855 100644
--- a/menu/m_items.c
+++ b/menu/m_items.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998,2000 Free Software Foundation, Inc.                   *
+ * 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            *
@@ -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_items.c,v 1.10 2002/07/06 15:22:16 juergen Exp $")
+MODULE_ID("$Id: m_items.c,v 1.17 2010/01/23 21:20:10 tom Exp $")
 
 /*---------------------------------------------------------------------------
 |   Facility      :  libnmenu  
@@ -54,39 +53,42 @@ MODULE_ID("$Id: m_items.c,v 1.10 2002/07/06 15:22:16 juergen Exp $")
 |                                     passed to the function
 +--------------------------------------------------------------------------*/
 NCURSES_EXPORT(int)
-set_menu_items (MENU * menu, ITEM ** items)
+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
 +--------------------------------------------------------------------------*/
 NCURSES_EXPORT(ITEM **)
-menu_items (const MENU *menu)
+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);
 }
 
 /*---------------------------------------------------------------------------
@@ -99,9 +101,10 @@ menu_items (const MENU *menu)
 |   Return Values :  Number of items or -1 to indicate error.
 +--------------------------------------------------------------------------*/
 NCURSES_EXPORT(int)
-item_count (const MENU *menu)
+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 */