ncurses 6.1 - patch 20190907

[ncurses.git] / form / fty_num.c

diff --git a/form/fty_num.c b/form/fty_num.c
index d45cb906794fe1af6313ed3b7eaa82a24e3743ee..d144ef4a97164d469d075e48f91882eb383cfeeb 100644 (file)
--- a/form/fty_num.c
+++ b/form/fty_num.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2012,2019 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,13 +34,13 @@
 
 #include "form.priv.h"
 
 
 #include "form.priv.h"
 

-MODULE_ID("$Id: fty_num.c,v 1.24 2007/02/03 23:37:46 tom Exp $")
+MODULE_ID("$Id: fty_num.c,v 1.31 2019/03/30 21:20:04 tom Exp $")

 
 #if HAVE_LOCALE_H
 #include <locale.h>
 #endif
 
 
 #if HAVE_LOCALE_H
 #include <locale.h>
 #endif
 

-#if HAVE_LOCALE_H
+#if HAVE_LOCALE_H && HAVE_LOCALECONV

 #define isDecimalPoint(c) ((c) == ((L && L->decimal_point) ? *(L->decimal_point) : '.'))
 #else
 #define isDecimalPoint(c) ((c) == '.')
 #define isDecimalPoint(c) ((c) == ((L && L->decimal_point) ? *(L->decimal_point) : '.'))
 #else
 #define isDecimalPoint(c) ((c) == '.')


@@ -63,35 +63,69 @@ typedef struct
   }
 thisARG;
 
   }
 thisARG;
 

+typedef struct
+  {
+    int precision;
+    double low;
+    double high;
+  }
+thisPARM;
+

 /*---------------------------------------------------------------------------
 |   Facility      :  libnform
 /*---------------------------------------------------------------------------
 |   Facility      :  libnform

-|   Function      :  static void *Make_This_Type(va_list * ap)
+|   Function      :  static void *Generic_This_Type(void * arg)

 |
 |   Description   :  Allocate structure for numeric type argument.
 |
 |   Return Values :  Pointer to argument structure or NULL on error
 +--------------------------------------------------------------------------*/
 static void *
 |
 |   Description   :  Allocate structure for numeric type argument.
 |
 |   Return Values :  Pointer to argument structure or NULL on error
 +--------------------------------------------------------------------------*/
 static void *

-Make_This_Type(va_list *ap)
+Generic_This_Type(void *arg)

 {
 {

-  thisARG *argn = (thisARG *) malloc(sizeof(thisARG));
+  thisARG *argn = (thisARG *) 0;
+  thisPARM *args = (thisPARM *) arg;

 
 

-  if (argn)
+  if (args)

     {
     {

-      T((T_CREATE("thisARG %p"), argn));
-      argn->precision = va_arg(*ap, int);
-      argn->low = va_arg(*ap, double);
-      argn->high = va_arg(*ap, double);
+      argn = typeMalloc(thisARG, 1);

 
 

-#if HAVE_LOCALE_H
-      argn->L = localeconv();
+      if (argn)
+       {
+         T((T_CREATE("thisARG %p"), (void *)argn));
+         argn->precision = args->precision;
+         argn->low = args->low;
+         argn->high = args->high;
+
+#if HAVE_LOCALE_H && HAVE_LOCALECONV
+         argn->L = localeconv();

 #else
 #else

-      argn->L = NULL;
+         argn->L = NULL;

 #endif
 #endif

+       }

     }
   return (void *)argn;
 }
 
     }
   return (void *)argn;
 }
 

+/*---------------------------------------------------------------------------
+|   Facility      :  libnform
+|   Function      :  static void *Make_This_Type(va_list * ap)
+|
+|   Description   :  Allocate structure for numeric type argument.
+|
+|   Return Values :  Pointer to argument structure or NULL on error
++--------------------------------------------------------------------------*/
+static void *
+Make_This_Type(va_list *ap)
+{
+  thisPARM arg;
+
+  arg.precision = va_arg(*ap, int);
+  arg.low = va_arg(*ap, double);
+  arg.high = va_arg(*ap, double);
+
+  return Generic_This_Type((void *)&arg);
+}
+

 /*---------------------------------------------------------------------------
 |   Facility      :  libnform
 |   Function      :  static void *Copy_This_Type(const void * argp)
 /*---------------------------------------------------------------------------
 |   Facility      :  libnform
 |   Function      :  static void *Copy_This_Type(const void * argp)


@@ -108,10 +142,10 @@ Copy_This_Type(const void *argp)
 
   if (argp)
     {
 
   if (argp)
     {

-      result = (thisARG *) malloc(sizeof(thisARG));
+      result = typeMalloc(thisARG, 1);

       if (result)
        {
       if (result)
        {

-         T((T_CREATE("thisARG %p"), result));
+         T((T_CREATE("thisARG %p"), (void *)result));

          *result = *ap;
        }
     }
          *result = *ap;
        }
     }


@@ -237,7 +271,8 @@ Check_This_Field(FIELD *field, const void *argp)
            }
          if (result)
            {
            }
          if (result)
            {

-             sprintf(buf, "%.*f", (prec > 0 ? prec : 0), val);
+             _nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf))
+                         "%.*f", (prec > 0 ? prec : 0), val);

              set_field_buffer(field, 0, buf);
            }
        }
              set_field_buffer(field, 0, buf);
            }
        }


@@ -279,12 +314,27 @@ static FIELDTYPE typeTHIS =
   Make_This_Type,
   Copy_This_Type,
   Free_This_Type,
   Make_This_Type,
   Copy_This_Type,
   Free_This_Type,

-  Check_This_Field,
-  Check_This_Character,
-  NULL,
-  NULL
+  INIT_FT_FUNC(Check_This_Field),
+  INIT_FT_FUNC(Check_This_Character),
+  INIT_FT_FUNC(NULL),
+  INIT_FT_FUNC(NULL),
+#if NCURSES_INTEROP_FUNCS
+  Generic_This_Type
+#endif

 };
 
 NCURSES_EXPORT_VAR(FIELDTYPE*) TYPE_NUMERIC = &typeTHIS;
 
 };
 
 NCURSES_EXPORT_VAR(FIELDTYPE*) TYPE_NUMERIC = &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
+   constructs (e.g. variable access or va_list + ellipsis constructs)
+*/
+NCURSES_EXPORT(FIELDTYPE *)
+_nc_TYPE_NUMERIC(void)
+{
+  return TYPE_NUMERIC;
+}
+#endif
+

 /* fty_num.c ends here */
 /* fty_num.c ends here */