X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=form%2Ffld_newftyp.c;h=a279a48bb2f5272a0ff22a7731c2711e2f23e059;hp=689eda454fec64460c6063945328557d88a6e0fd;hb=45291421bee33c79ffb4c8f0e1b67ca5cc262114;hpb=f5da57ad7eb397b1001e2fca9cb0e278a6564716 diff --git a/form/fld_newftyp.c b/form/fld_newftyp.c index 689eda45..a279a48b 100644 --- a/form/fld_newftyp.c +++ b/form/fld_newftyp.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc. * + * Copyright (c) 1998-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 * @@ -32,7 +32,7 @@ #include "form.priv.h" -MODULE_ID("$Id: fld_newftyp.c,v 1.18 2009/11/07 20:18:30 tom Exp $") +MODULE_ID("$Id: fld_newftyp.c,v 1.21 2018/12/16 00:14:22 tom Exp $") static FIELDTYPE default_fieldtype = { @@ -53,7 +53,7 @@ static FIELDTYPE default_fieldtype = }; NCURSES_EXPORT_VAR(FIELDTYPE *) -_nc_Default_FieldType = &default_fieldtype; + _nc_Default_FieldType = &default_fieldtype; /*--------------------------------------------------------------------------- | Facility : libnform @@ -76,14 +76,19 @@ 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 = typeMalloc(FIELDTYPE, 1); if (nftyp) { - T((T_CREATE("fieldtype %p"), nftyp)); + T((T_CREATE("fieldtype %p"), (void *)nftyp)); *nftyp = default_fieldtype; #if NCURSES_INTEROP_FUNCS nftyp->fieldcheck.ofcheck = field_check; @@ -118,7 +123,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);