ncurses 6.1 - patch 20191221

[ncurses.git] / form / fty_generic.c

diff --git a/form/fty_generic.c b/form/fty_generic.c
index 6ab5ed7771937d6c70a8ec28d8c2462ed65acf50..62e5c52f9bca30dafddc6096e6b1aa0e497e4cc2 100644 (file)
--- a/form/fty_generic.c
+++ b/form/fty_generic.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 2008,2009 Free Software Foundation, Inc.                   *
+ * Copyright (c) 2008-2016,2018 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            *


@@ -34,7 +34,7 @@
 
 #include "form.priv.h"
 
 
 #include "form.priv.h"
 

-MODULE_ID("$Id: fty_generic.c,v 1.4 2009/11/07 20:42:38 tom Exp $")
+MODULE_ID("$Id: fty_generic.c,v 1.8 2018/12/16 00:14:02 tom Exp $")

 
 /*
  * This is not a full implementation of a field type, but adds some
 
 /*
  * This is not a full implementation of a field type, but adds some


@@ -109,8 +109,14 @@ _nc_generic_fieldtype(bool (*const field_check) (FORM *, FIELD *, const void *),
   int code = E_SYSTEM_ERROR;
   FIELDTYPE *res = (FIELDTYPE *)0;
 
   int code = E_SYSTEM_ERROR;
   FIELDTYPE *res = (FIELDTYPE *)0;
 

-  T((T_CALLED("_nc_generic_fieldtype(%p,%p,%p,%p,%p)"),
-     field_check, char_check, next, prev, freecallback));
+  TR_FUNC_BFR(5);
+
+  T((T_CALLED("_nc_generic_fieldtype(%s,%s,%s,%s,%s)"),
+     TR_FUNC_ARG(0, field_check),
+     TR_FUNC_ARG(1, char_check),
+     TR_FUNC_ARG(2, next),
+     TR_FUNC_ARG(3, prev),
+     TR_FUNC_ARG(4, freecallback)));

 
   if (field_check || char_check)
     {
 
   if (field_check || char_check)
     {


@@ -119,7 +125,7 @@ _nc_generic_fieldtype(bool (*const field_check) (FORM *, FIELD *, const void *),
       if (res)
        {
          *res = *_nc_Default_FieldType;
       if (res)
        {
          *res = *_nc_Default_FieldType;

-         res->status |= (_HAS_ARGS | _GENERIC);
+         SetStatus(res, (_HAS_ARGS | _GENERIC));

          res->fieldcheck.gfcheck = field_check;
          res->charcheck.gccheck = char_check;
          res->genericarg = Generic_This_Type;
          res->fieldcheck.gfcheck = field_check;
          res->charcheck.gccheck = char_check;
          res->genericarg = Generic_This_Type;


@@ -288,7 +294,10 @@ _nc_form_cursor(const FORM *form, int *pRow, int *pCol)
 
 #else
 extern void _nc_fty_generic(void);
 
 #else
 extern void _nc_fty_generic(void);

-void _nc_fty_generic(void) { }
+void
+_nc_fty_generic(void)
+{
+}

 #endif
 
 /* fty_generic.c ends here */
 #endif
 
 /* fty_generic.c ends here */