ncurses 6.2 - patch 20200912

[ncurses.git] / menu / m_items.c

diff --git a/menu/m_items.c b/menu/m_items.c
index 3e8f70b0fa7dccb3ecfc8ec9b211b18fd684b6ce..a539fddd3d1d2c526f7bc85501bff2a6527357a9 100644 (file)
--- a/menu/m_items.c
+++ b/menu/m_items.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
+ * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 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            *
@@ -37,7 +38,7 @@
 
 #include "menu.priv.h"
 
-MODULE_ID("$Id: m_items.c,v 1.16 2005/01/16 01:02:23 tom Exp $")
+MODULE_ID("$Id: m_items.c,v 1.19 2020/05/24 01:40:20 anonymous.maarten Exp $")
 
 /*---------------------------------------------------------------------------
 |   Facility      :  libnmenu  
@@ -52,10 +53,10 @@ MODULE_ID("$Id: m_items.c,v 1.16 2005/01/16 01:02:23 tom Exp $")
 |                    E_BAD_ARGUMENT - An incorrect menu or item array was
 |                                     passed to the function
 +--------------------------------------------------------------------------*/
-NCURSES_EXPORT(int)
+MENU_EXPORT(int)
 set_menu_items(MENU * menu, ITEM ** items)
 {
-  T((T_CALLED("set_menu_items(%p,%p)"), menu, items));
+  T((T_CALLED("set_menu_items(%p,%p)"), (void *)menu, (void *)items));
 
   if (!menu || (items && !(*items)))
     RETURN(E_BAD_ARGUMENT);
@@ -84,10 +85,10 @@ set_menu_items(MENU * menu, ITEM ** items)
 |
 |   Return Values :  NULL on error
 +--------------------------------------------------------------------------*/
-NCURSES_EXPORT(ITEM **)
+MENU_EXPORT(ITEM **)
 menu_items(const MENU * menu)
 {
-  T((T_CALLED("menu_items(%p)"), menu));
+  T((T_CALLED("menu_items(%p)"), (const void *)menu));
   returnItemPtr(menu ? menu->items : (ITEM **) 0);
 }
 
@@ -100,10 +101,10 @@ menu_items(const MENU * menu)
 |
 |   Return Values :  Number of items or -1 to indicate error.
 +--------------------------------------------------------------------------*/
-NCURSES_EXPORT(int)
+MENU_EXPORT(int)
 item_count(const MENU * menu)
 {
-  T((T_CALLED("item_count(%p)"), menu));
+  T((T_CALLED("item_count(%p)"), (const void *)menu));
   returnCode(menu ? menu->nitems : -1);
 }