ncurses 6.1 - patch 20180512

[ncurses.git] / form / frm_hook.c

diff --git a/form/frm_hook.c b/form/frm_hook.c
index 367cf5fafb34fa056db6533c841a13a5784d6139..8c36cb39004fd4dc66c7094e1d8350978c4d0b05 100644 (file)
--- a/form/frm_hook.c
+++ b/form/frm_hook.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2002,2003 Free Software Foundation, Inc.              *
+ * Copyright (c) 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            *
@@ -32,12 +32,13 @@
 
 #include "form.priv.h"
 
-MODULE_ID("$Id: frm_hook.c,v 1.11 2003/10/25 15:17:08 tom Exp $")
+MODULE_ID("$Id: frm_hook.c,v 1.17 2016/01/23 21:32:00 tom 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)\
 {\
+   T((T_CALLED("set_" #typ"_"#name"(%p,%p)"), (void *) form, TR_FUNC(func)));\
    (Normalize_Form( form ) -> typ ## name) = func ;\
    RETURN(E_OK);\
 }
@@ -46,95 +47,96 @@ NCURSES_IMPEXP int NCURSES_API set_ ## typ ## _ ## name (FORM *form, Form_Hook f
 #define GEN_HOOK_GET_FUNCTION( typ, name ) \
 NCURSES_IMPEXP Form_Hook NCURSES_API typ ## _ ## name ( const FORM *form )\
 {\
-   return ( Normalize_Form( form ) -> typ ## name );\
+   T((T_CALLED(#typ "_" #name "(%p)"), (const void *) form));\
+   returnFormHook( Normalize_Form( form ) -> typ ## name );\
 }
-\f
+
 /*---------------------------------------------------------------------------
-|   Facility      :  libnform  
+|   Facility      :  libnform
 |   Function      :  int set_field_init(FORM *form, Form_Hook f)
-|   
+|
 |   Description   :  Assigns an application defined initialization function
 |                    to be called when the form is posted and just after
 |                    the current field changes.
 |
 |   Return Values :  E_OK      - success
 +--------------------------------------------------------------------------*/
-GEN_HOOK_SET_FUNCTION(field,init)
+GEN_HOOK_SET_FUNCTION(field, init)
 
 /*---------------------------------------------------------------------------
-|   Facility      :  libnform  
+|   Facility      :  libnform
 |   Function      :  Form_Hook field_init(const FORM *form)
-|   
+|
 |   Description   :  Retrieve field initialization routine address.
 |
 |   Return Values :  The address or NULL if no hook defined.
 +--------------------------------------------------------------------------*/
-GEN_HOOK_GET_FUNCTION(field,init)
+GEN_HOOK_GET_FUNCTION(field, init)
 
 /*---------------------------------------------------------------------------
-|   Facility      :  libnform  
+|   Facility      :  libnform
 |   Function      :  int set_field_term(FORM *form, Form_Hook f)
-|   
+|
 |   Description   :  Assigns an application defined finalization function
 |                    to be called when the form is unposted and just before
 |                    the current field changes.
 |
 |   Return Values :  E_OK      - success
 +--------------------------------------------------------------------------*/
-GEN_HOOK_SET_FUNCTION(field,term)
+GEN_HOOK_SET_FUNCTION(field, term)
 
 /*---------------------------------------------------------------------------
-|   Facility      :  libnform  
+|   Facility      :  libnform
 |   Function      :  Form_Hook field_term(const FORM *form)
-|   
+|
 |   Description   :  Retrieve field finalization routine address.
 |
 |   Return Values :  The address or NULL if no hook defined.
 +--------------------------------------------------------------------------*/
-GEN_HOOK_GET_FUNCTION(field,term)
+GEN_HOOK_GET_FUNCTION(field, term)
 
 /*---------------------------------------------------------------------------
-|   Facility      :  libnform  
+|   Facility      :  libnform
 |   Function      :  int set_form_init(FORM *form, Form_Hook f)
-|   
+|
 |   Description   :  Assigns an application defined initialization function
 |                    to be called when the form is posted and just after
 |                    a page change.
 |
 |   Return Values :  E_OK       - success
 +--------------------------------------------------------------------------*/
-GEN_HOOK_SET_FUNCTION(form,init)
+GEN_HOOK_SET_FUNCTION(form, init)
 
 /*---------------------------------------------------------------------------
-|   Facility      :  libnform  
+|   Facility      :  libnform
 |   Function      :  Form_Hook form_init(const FORM *form)
-|   
+|
 |   Description   :  Retrieve form initialization routine address.
 |
 |   Return Values :  The address or NULL if no hook defined.
 +--------------------------------------------------------------------------*/
-GEN_HOOK_GET_FUNCTION(form,init)
+GEN_HOOK_GET_FUNCTION(form, init)
 
 /*---------------------------------------------------------------------------
-|   Facility      :  libnform  
+|   Facility      :  libnform
 |   Function      :  int set_form_term(FORM *form, Form_Hook f)
-|   
+|
 |   Description   :  Assigns an application defined finalization function
 |                    to be called when the form is unposted and just before
 |                    a page change.
 |
 |   Return Values :  E_OK       - success
 +--------------------------------------------------------------------------*/
-GEN_HOOK_SET_FUNCTION(form,term)
+GEN_HOOK_SET_FUNCTION(form, term)
 
 /*---------------------------------------------------------------------------
-|   Facility      :  libnform  
+|   Facility      :  libnform
 |   Function      :  Form_Hook form_term(const FORM *form)
-|   
+|
 |   Description   :  Retrieve form finalization routine address.
 |
 |   Return Values :  The address or NULL if no hook defined.
 +--------------------------------------------------------------------------*/
-GEN_HOOK_GET_FUNCTION(form,term)
+GEN_HOOK_GET_FUNCTION(form, term)
 
 /* frm_hook.c ends here */