NEWS.stable: log cherry-pick [e446f25]->[c092018] relocatable-shell: Update suggested...

[gnulib.git] / lib / xstrtod.c

diff --git a/lib/xstrtod.c b/lib/xstrtod.c
index e711ec8..7caa615 100644 (file)
--- a/lib/xstrtod.c
+++ b/lib/xstrtod.c
@@ -1,12 +1,12 @@
 /* error-checking interface to strtod-like functions
 
-   Copyright (C) 1996, 1999, 2000, 2003, 2004, 2005, 2006 Free
-   Software Foundation, Inc.
+   Copyright (C) 1996, 1999-2000, 2003-2006, 2009-2014 Free Software
+   Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,14 +14,11 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by Jim Meyering.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "xstrtod.h"
 
@@ -46,7 +43,7 @@
 
 bool
 XSTRTOD (char const *str, char const **ptr, DOUBLE *result,
-        DOUBLE (*convert) (char const *, char **))
+         DOUBLE (*convert) (char const *, char **))
 {
   DOUBLE val;
   char *terminator;
@@ -61,9 +58,9 @@ XSTRTOD (char const *str, char const **ptr, DOUBLE *result,
   else
     {
       /* Allow underflow (in which case CONVERT returns zero),
-        but flag overflow as an error. */
+         but flag overflow as an error. */
       if (val != 0 && errno == ERANGE)
-       ok = false;
+        ok = false;
     }
 
   if (ptr != NULL)