public inbox for newlib-cvs@sourceware.org
help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org>
To: newlib-cvs@sourceware.org
Subject: [newlib-cygwin] Use nanf("") instead of nanf(NULL)
Date: Wed, 29 Aug 2018 14:01:00 -0000 [thread overview]
Message-ID: <20180829140107.77342.qmail@sourceware.org> (raw)
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=2c245028afa4883163c6ad7d04da9f7b7745b3b4
commit 2c245028afa4883163c6ad7d04da9f7b7745b3b4
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 27 11:32:28 2018 -0700
Use nanf("") instead of nanf(NULL)
Newer GCC versions require a non-NULL argument to this function for
some reason.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diff:
---
newlib/libc/stdio/nano-vfscanf_float.c | 2 +-
newlib/libc/stdio/vfscanf.c | 2 +-
newlib/libc/stdio/vfwscanf.c | 2 +-
newlib/libc/stdlib/strtod.c | 4 ++--
newlib/libc/stdlib/wcstod.c | 6 +++---
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/newlib/libc/stdio/nano-vfscanf_float.c b/newlib/libc/stdio/nano-vfscanf_float.c
index a81fe7f..5df9f22 100644
--- a/newlib/libc/stdio/nano-vfscanf_float.c
+++ b/newlib/libc/stdio/nano-vfscanf_float.c
@@ -330,7 +330,7 @@ fskip:
{
flp = GET_ARG (N, *ap, float *);
if (isnan (fp))
- *flp = nanf (NULL);
+ *flp = nanf ("");
else
*flp = fp;
}
diff --git a/newlib/libc/stdio/vfscanf.c b/newlib/libc/stdio/vfscanf.c
index 080dcf4..9c38eeb 100644
--- a/newlib/libc/stdio/vfscanf.c
+++ b/newlib/libc/stdio/vfscanf.c
@@ -1886,7 +1886,7 @@ __SVFSCANF_R (struct _reent *rptr,
{
flp = GET_ARG (N, ap, float *);
if (isnan (res))
- *flp = nanf (NULL);
+ *flp = nanf ("");
else
*flp = res;
}
diff --git a/newlib/libc/stdio/vfwscanf.c b/newlib/libc/stdio/vfwscanf.c
index c3470a1..0464b08 100644
--- a/newlib/libc/stdio/vfwscanf.c
+++ b/newlib/libc/stdio/vfwscanf.c
@@ -1636,7 +1636,7 @@ __SVFWSCANF_R (struct _reent *rptr,
{
flp = GET_ARG (N, ap, float *);
if (isnan (res))
- *flp = nanf (NULL);
+ *flp = nanf ("");
else
*flp = res;
}
diff --git a/newlib/libc/stdlib/strtod.c b/newlib/libc/stdlib/strtod.c
index 431d3ab..2a76b10 100644
--- a/newlib/libc/stdlib/strtod.c
+++ b/newlib/libc/stdlib/strtod.c
@@ -1289,7 +1289,7 @@ strtof_l (const char *__restrict s00, char **__restrict se, locale_t loc)
{
double val = _strtod_l (_REENT, s00, se, loc);
if (isnan (val))
- return signbit (val) ? -nanf (NULL) : nanf (NULL);
+ return signbit (val) ? -nanf ("") : nanf ("");
float retval = (float) val;
#ifndef NO_ERRNO
if (isinf (retval) && !isinf (val))
@@ -1304,7 +1304,7 @@ strtof (const char *__restrict s00,
{
double val = _strtod_l (_REENT, s00, se, __get_current_locale ());
if (isnan (val))
- return signbit (val) ? -nanf (NULL) : nanf (NULL);
+ return signbit (val) ? -nanf ("") : nanf ("");
float retval = (float) val;
#ifndef NO_ERRNO
if (isinf (retval) && !isinf (val))
diff --git a/newlib/libc/stdlib/wcstod.c b/newlib/libc/stdlib/wcstod.c
index 9e0d563..810c5b3 100644
--- a/newlib/libc/stdlib/wcstod.c
+++ b/newlib/libc/stdlib/wcstod.c
@@ -228,7 +228,7 @@ _wcstof_r (struct _reent *ptr,
{
double retval = _wcstod_l (ptr, nptr, endptr, __get_current_locale ());
if (isnan (retval))
- return nanf (NULL);
+ return nanf ("");
return (float)retval;
}
@@ -253,7 +253,7 @@ wcstof_l (const wchar_t *__restrict nptr, wchar_t **__restrict endptr,
{
double val = _wcstod_l (_REENT, nptr, endptr, loc);
if (isnan (val))
- return nanf (NULL);
+ return nanf ("");
float retval = (float) val;
#ifndef NO_ERRNO
if (isinf (retval) && !isinf (val))
@@ -268,7 +268,7 @@ wcstof (const wchar_t *__restrict nptr,
{
double val = _wcstod_l (_REENT, nptr, endptr, __get_current_locale ());
if (isnan (val))
- return nanf (NULL);
+ return nanf ("");
float retval = (float) val;
#ifndef NO_ERRNO
if (isinf (retval) && !isinf (val))
reply other threads:[~2018-08-29 14:01 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180829140107.77342.qmail@sourceware.org \
--to=corinna@sourceware.org \
--cc=newlib-cvs@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).