Module Name: src
Committed By: rillig
Date: Thu Jul 29 06:35:21 UTC 2021
Modified Files:
src/usr.bin/make: cond.c
Log Message:
make: in TryParseNumber, reset errno as late as possible
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.269 -r1.270 src/usr.bin/make/cond.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/cond.c
diff -u src/usr.bin/make/cond.c:1.269 src/usr.bin/make/cond.c:1.270
--- src/usr.bin/make/cond.c:1.269 Mon Jun 21 21:10:01 2021
+++ src/usr.bin/make/cond.c Thu Jul 29 06:35:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.269 2021/06/21 21:10:01 rillig Exp $ */
+/* $NetBSD: cond.c,v 1.270 2021/07/29 06:35:20 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -95,7 +95,7 @@
#include "dir.h"
/* "@(#)cond.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: cond.c,v 1.269 2021/06/21 21:10:01 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.270 2021/07/29 06:35:20 rillig Exp $");
/*
* The parsing of conditional expressions is based on this grammar:
@@ -376,12 +376,12 @@ TryParseNumber(const char *str, double *
unsigned long ul_val;
double dbl_val;
- errno = 0;
if (str[0] == '\0') { /* XXX: why is an empty string a number? */
*out_value = 0.0;
return true;
}
+ errno = 0;
ul_val = strtoul(str, &end, str[1] == 'x' ? 16 : 10);
if (*end == '\0' && errno != ERANGE) {
*out_value = str[0] == '-' ? -(double)-ul_val : (double)ul_val;
