diff options
author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2023-10-17 09:52:12 +0000 |
---|---|---|
committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2023-10-17 09:52:12 +0000 |
commit | 4dd5152bda3754d6c8238063f70a240feb2e0e01 (patch) | |
tree | 6761e0e8227c4b726ec8793dfd89d53fcf7c2e8a /lib/libform/frm_hook.c | |
parent | 19c1736b607cf07af1e272ef5638ff0d90b4faff (diff) |
Update ncurses and associated libraries (form, panel, menu) to
6.4-20230826 (from 5.7-20081102).
Based on result from Thomas Dickey's ncu2openbsd script and then
modified. Switches to the upstream tput. Major bump for the ncurses
libraries and for libedit and libreadline.
Help from tb, millert.
ok deraadt sthen
Diffstat (limited to 'lib/libform/frm_hook.c')
-rw-r--r-- | lib/libform/frm_hook.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/lib/libform/frm_hook.c b/lib/libform/frm_hook.c index f3fd4d48d22..3714ac77ee3 100644 --- a/lib/libform/frm_hook.c +++ b/lib/libform/frm_hook.c @@ -1,6 +1,7 @@ -/* $OpenBSD: frm_hook.c,v 1.8 2015/01/23 22:48:51 krw Exp $ */ +/* $OpenBSD: frm_hook.c,v 1.9 2023/10/17 09:52:10 nicm Exp $ */ /**************************************************************************** - * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc. * + * Copyright 2018,2020 Thomas E. Dickey * + * Copyright 1998-2012,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 * @@ -33,22 +34,23 @@ #include "form.priv.h" -MODULE_ID("$Id: frm_hook.c,v 1.8 2015/01/23 22:48:51 krw Exp $") +MODULE_ID("$Id: frm_hook.c,v 1.9 2023/10/17 09:52:10 nicm Exp $") /* "Template" macro to generate function to set application specific hook */ #define GEN_HOOK_SET_FUNCTION( typ, name ) \ -NCURSES_IMPEXP int NCURSES_API set_ ## typ ## _ ## name (FORM *form, Form_Hook func)\ +FORM_IMPEXP int NCURSES_API set_ ## typ ## _ ## name (FORM *form, Form_Hook func)\ {\ - T((T_CALLED("set_" #typ"_"#name"(%p,%p)"), form, func));\ + TR_FUNC_BFR(1); \ + T((T_CALLED("set_" #typ"_"#name"(%p,%s)"), (void *) form, TR_FUNC_ARG(0, func)));\ (Normalize_Form( form ) -> typ ## name) = func ;\ RETURN(E_OK);\ } /* "Template" macro to generate function to get application specific hook */ #define GEN_HOOK_GET_FUNCTION( typ, name ) \ -NCURSES_IMPEXP Form_Hook NCURSES_API typ ## _ ## name ( const FORM *form )\ +FORM_IMPEXP Form_Hook NCURSES_API typ ## _ ## name ( const FORM *form )\ {\ - T((T_CALLED(#typ "_" #name "(%p)"), form));\ + T((T_CALLED(#typ "_" #name "(%p)"), (const void *) form));\ returnFormHook( Normalize_Form( form ) -> typ ## name );\ } |