ncurses 6.2 - patch 20200328

[ncurses.git] / form / fld_newftyp.c

diff --git a/form/fld_newftyp.c b/form/fld_newftyp.c
index 235cd5f5e432558fa714d325549676e4a7966026..18a7c0739cdc69d9b2bd5e1129ce128c7c9d6271 100644 (file)
--- a/form/fld_newftyp.c
+++ b/form/fld_newftyp.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.              *
+ * Copyright 2018,2020 Thomas E. Dickey                                     *
+ * Copyright 1998-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            *
@@ -32,9 +33,9 @@
 
 #include "form.priv.h"
 
-MODULE_ID("$Id: fld_newftyp.c,v 1.13 2004/12/25 22:24:10 tom Exp $")
+MODULE_ID("$Id: fld_newftyp.c,v 1.22 2020/02/02 23:34:34 tom Exp $")
 
-static FIELDTYPE const default_fieldtype =
+static FIELDTYPE default_fieldtype =
 {
   0,                           /* status                                      */
   0L,                          /* reference count                             */
@@ -43,14 +44,17 @@ static FIELDTYPE const default_fieldtype =
   NULL,                                /* makearg function                            */
   NULL,                                /* copyarg function                            */
   NULL,                                /* freearg function                            */
-  NULL,                                /* field validation function                   */
-  NULL,                                /* Character check function                    */
-  NULL,                                /* enumerate next function                     */
-  NULL                         /* enumerate previous function                 */
+  INIT_FT_FUNC(NULL),          /* field validation function                   */
+  INIT_FT_FUNC(NULL),          /* Character check function                    */
+  INIT_FT_FUNC(NULL),          /* enumerate next function                     */
+  INIT_FT_FUNC(NULL),          /* enumerate previous function                 */
+#if NCURSES_INTEROP_FUNCS
+  NULL                         /* generic callback alternative to makearg     */
+#endif
 };
 
-NCURSES_EXPORT_VAR(const FIELDTYPE *)
-_nc_Default_FieldType = &default_fieldtype;
+NCURSES_EXPORT_VAR(FIELDTYPE *)
+  _nc_Default_FieldType = &default_fieldtype;
 
 /*---------------------------------------------------------------------------
 |   Facility      :  libnform
@@ -73,16 +77,27 @@ new_fieldtype(bool (*const field_check) (FIELD *, const void *),
 {
   FIELDTYPE *nftyp = (FIELDTYPE *)0;
 
-  T((T_CALLED("new_fieldtype(%p,%p)"), field_check, char_check));
+  TR_FUNC_BFR(2);
+
+  T((T_CALLED("new_fieldtype(%s,%s)"),
+     TR_FUNC_ARG(0, field_check),
+     TR_FUNC_ARG(1, char_check)));
+
   if ((field_check) || (char_check))
     {
-      nftyp = (FIELDTYPE *)malloc(sizeof(FIELDTYPE));
+      nftyp = typeMalloc(FIELDTYPE, 1);
 
       if (nftyp)
        {
+         T((T_CREATE("fieldtype %p"), (void *)nftyp));
          *nftyp = default_fieldtype;
+#if NCURSES_INTEROP_FUNCS
+         nftyp->fieldcheck.ofcheck = field_check;
+         nftyp->charcheck.occheck = char_check;
+#else
          nftyp->fcheck = field_check;
          nftyp->ccheck = char_check;
+#endif
        }
       else
        {
@@ -109,7 +124,7 @@ new_fieldtype(bool (*const field_check) (FIELD *, const void *),
 NCURSES_EXPORT(int)
 free_fieldtype(FIELDTYPE *typ)
 {
-  T((T_CALLED("free_fieldtype(%p)"), typ));
+  T((T_CALLED("free_fieldtype(%p)"), (void *)typ));
 
   if (!typ)
     RETURN(E_BAD_ARGUMENT);