ncurses 6.2 - patch 20201212

[ncurses.git] / form / fty_int.c

diff --git a/form/fty_int.c b/form/fty_int.c
index e13e5be203f7b66224a0307819ac6b2d35240648..d06ab8b6f389921c5539167e7af298429cf2fbc3 100644 (file)
--- a/form/fty_int.c
+++ b/form/fty_int.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.              *
+ * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 1998-2010,2012 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            *
@@ -34,7 +35,7 @@
 
 #include "form.priv.h"
 
-MODULE_ID("$Id: fty_int.c,v 1.24 2009/11/07 20:17:58 tom Exp $")
+MODULE_ID("$Id: fty_int.c,v 1.31 2020/12/12 01:15:37 tom Exp $")
 
 #if USE_WIDEC_SUPPORT
 #define isDigit(c) (iswdigit((wint_t)(c)) || isdigit(UChar(c)))
@@ -71,8 +72,8 @@ integerPARM;
 static void *
 Generic_This_Type(void *arg)
 {
-  thisARG *argp = (thisARG *) 0;
-  thisARG *param = (thisARG *) arg;
+  thisARG *argp = (thisARG *)0;
+  thisARG *param = (thisARG *)arg;
 
   if (param)
     {
@@ -80,7 +81,7 @@ Generic_This_Type(void *arg)
 
       if (argp)
        {
-         T((T_CREATE("thisARG %p"), argp));
+         T((T_CREATE("thisARG %p"), (void *)argp));
          *argp = *param;
        }
     }
@@ -119,14 +120,15 @@ static void *
 Copy_This_Type(const void *argp)
 {
   const thisARG *ap = (const thisARG *)argp;
-  thisARG *result = (thisARG *) 0;
+  thisARG *result = (thisARG *)0;
 
   if (argp)
     {
       result = typeMalloc(thisARG, 1);
+
       if (result)
        {
-         T((T_CREATE("thisARG %p"), result));
+         T((T_CREATE("thisARG %p"), (void *)result));
          *result = *ap;
        }
     }
@@ -233,7 +235,8 @@ Check_This_Field(FIELD *field, const void *argp)
            }
          if (result)
            {
-             sprintf(buf, "%.*ld", (prec > 0 ? prec : 0), val);
+             _nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf))
+                         "%.*ld", (prec > 0 ? prec : 0), val);
              set_field_buffer(field, 0, buf);
            }
        }
@@ -276,14 +279,14 @@ static FIELDTYPE typeTHIS =
 #endif
 };
 
-NCURSES_EXPORT_VAR(FIELDTYPE*) TYPE_INTEGER = &typeTHIS;
+FORM_EXPORT_VAR(FIELDTYPE *) TYPE_INTEGER = &typeTHIS;
 
 #if NCURSES_INTEROP_FUNCS
 /* The next routines are to simplify the use of ncurses from
-   programming languages with restictions on interop with C level
+   programming languages with restrictions on interop with C level
    constructs (e.g. variable access or va_list + ellipsis constructs)
 */
-NCURSES_EXPORT(FIELDTYPE *)
+FORM_EXPORT(FIELDTYPE *)
 _nc_TYPE_INTEGER(void)
 {
   return TYPE_INTEGER;