ncurses 6.2 - patch 20210605

[ncurses.git] / form / fty_int.c

diff --git a/form/fty_int.c b/form/fty_int.c
index 1e43874ef64fe95933856873908db1d9303ae5d2..70fe97d0356b5dbc136ca812937a6868e8836eab 100644 (file)
--- a/form/fty_int.c
+++ b/form/fty_int.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+ * Copyright 2020,2021 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.26 2012/02/23 10:02:15 tom Exp $")
+MODULE_ID("$Id: fty_int.c,v 1.32 2021/03/27 23:49:58 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)
     {
@@ -119,11 +120,12 @@ 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"), (void *)result));
@@ -168,11 +170,9 @@ Check_This_Field(FIELD *field, const void *argp)
   int prec = argi->precision;
   unsigned char *bp = (unsigned char *)field_buffer(field, 0);
   char *s = (char *)bp;
-  long val;
-  char buf[100];
   bool result = FALSE;
 
-  while (*bp && *bp == ' ')
+  while (*bp == ' ')
     bp++;
   if (*bp)
     {
@@ -181,13 +181,14 @@ Check_This_Field(FIELD *field, const void *argp)
 #if USE_WIDEC_SUPPORT
       if (*bp)
        {
-         bool blank = FALSE;
          int len;
-         int n;
          wchar_t *list = _nc_Widen_String((char *)bp, &len);
 
          if (list != 0)
            {
+             bool blank = FALSE;
+             int n;
+
              result = TRUE;
              for (n = 0; n < len; ++n)
                {
@@ -225,7 +226,8 @@ Check_This_Field(FIELD *field, const void *argp)
 #endif
       if (result)
        {
-         val = atol(s);
+         long val = atol(s);
+
          if (low < high)
            {
              if (val < low || val > high)
@@ -233,6 +235,8 @@ Check_This_Field(FIELD *field, const void *argp)
            }
          if (result)
            {
+             char buf[100];
+
              _nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf))
                          "%.*ld", (prec > 0 ? prec : 0), val);
              set_field_buffer(field, 0, buf);
@@ -277,14 +281,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;