ncurses 6.2 - patch 20200801

[ncurses.git] / menu / m_trace.c

diff --git a/menu/m_trace.c b/menu/m_trace.c
index 0f9f90273a6a3536c470434c2d668b2944a61119..b0ab45eeceb124f0a59e755dff7b228e8a1d6988 100644 (file)
--- a/menu/m_trace.c
+++ b/menu/m_trace.c
@@ -1,5 +1,6 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 2004,2005 Free Software Foundation, Inc.                   *
+ * Copyright 2018,2020 Thomas E. Dickey                                     *
+ * Copyright 2004-2010,2016 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -32,44 +33,45 @@
 
 #include "menu.priv.h"
 
 
 #include "menu.priv.h"
 

-MODULE_ID("$Id: m_trace.c,v 1.3 2005/01/16 01:06:11 tom Exp $")
+MODULE_ID("$Id: m_trace.c,v 1.8 2020/05/24 01:40:20 anonymous.maarten Exp $")

 
 

-NCURSES_EXPORT(ITEM *)
+MENU_EXPORT(ITEM *)

 _nc_retrace_item(ITEM * code)
 {
 _nc_retrace_item(ITEM * code)
 {

-  T((T_RETURN("%p"), code));
+  T((T_RETURN("%p"), (void *)code));

   return code;
 }
 
   return code;
 }
 

-NCURSES_EXPORT(ITEM **)
+MENU_EXPORT(ITEM **)

 _nc_retrace_item_ptr(ITEM ** code)
 {
 _nc_retrace_item_ptr(ITEM ** code)
 {

-  T((T_RETURN("%p"), code));
+  T((T_RETURN("%p"), (void *)code));

   return code;
 }
 
   return code;
 }
 

-NCURSES_EXPORT(Item_Options)
+MENU_EXPORT(Item_Options)

 _nc_retrace_item_opts(Item_Options code)
 {
   T((T_RETURN("%d"), code));
   return code;
 }
 
 _nc_retrace_item_opts(Item_Options code)
 {
   T((T_RETURN("%d"), code));
   return code;
 }
 

-NCURSES_EXPORT(MENU *)
+MENU_EXPORT(MENU *)

 _nc_retrace_menu(MENU * code)
 {
 _nc_retrace_menu(MENU * code)
 {

-  T((T_RETURN("%p"), code));
+  T((T_RETURN("%p"), (void *)code));

   return code;
 }
 
   return code;
 }
 

-NCURSES_EXPORT(Menu_Hook)
+MENU_EXPORT(Menu_Hook)

 _nc_retrace_menu_hook(Menu_Hook code)
 {
 _nc_retrace_menu_hook(Menu_Hook code)
 {

-  T((T_RETURN("%p"), code));
+  TR_FUNC_BFR(1);
+  T((T_RETURN("%s"), TR_FUNC_ARG(0, code)));

   return code;
 }
 
   return code;
 }
 

-NCURSES_EXPORT(Menu_Options)
+MENU_EXPORT(Menu_Options)

 _nc_retrace_menu_opts(Menu_Options code)
 {
   T((T_RETURN("%d"), code));
 _nc_retrace_menu_opts(Menu_Options code)
 {
   T((T_RETURN("%d"), code));