ncurses 6.1 - patch 20191221

[ncurses.git] / form / fty_num.c

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

- * Copyright (c) 1998-2007,2009 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.27 2009/11/07 20:17:58 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) == '.')


@@ -91,12 +91,12 @@ Generic_This_Type(void *arg)
 
       if (argn)
        {
 
       if (argn)
        {

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

          argn->precision = args->precision;
          argn->low = args->low;
          argn->high = args->high;
 
          argn->precision = args->precision;
          argn->low = args->low;
          argn->high = args->high;
 

-#if HAVE_LOCALE_H
+#if HAVE_LOCALE_H && HAVE_LOCALECONV

          argn->L = localeconv();
 #else
          argn->L = NULL;
          argn->L = localeconv();
 #else
          argn->L = NULL;


@@ -145,7 +145,7 @@ Copy_This_Type(const void *argp)
       result = typeMalloc(thisARG, 1);
       if (result)
        {
       result = typeMalloc(thisARG, 1);
       if (result)
        {

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

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


@@ -271,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);
            }
        }