[Midnightbsd-cvs] src [10535] trunk/lib/libc/stdlib/strtonum.c: sync with openbsd

[laffer1 at midnightbsd.org]

Revision: 10535
          http://svnweb.midnightbsd.org/src/?rev=10535
Author:   laffer1
Date:     2018-06-07 19:00:25 -0400 (Thu, 07 Jun 2018)
Log Message:
-----------
sync with openbsd

Modified Paths:
--------------
    trunk/lib/libc/stdlib/strtonum.c

Modified: trunk/lib/libc/stdlib/strtonum.c
===================================================================
--- trunk/lib/libc/stdlib/strtonum.c	2018-06-07 22:58:42 UTC (rev 10534)
+++ trunk/lib/libc/stdlib/strtonum.c	2018-06-07 23:00:25 UTC (rev 10535)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2004 Ted Unangst and Todd Miller
  * All rights reserved.
@@ -14,19 +15,19 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- *	$OpenBSD: strtonum.c,v 1.6 2004/08/03 19:38:01 millert Exp $
+ *	$OpenBSD: strtonum.c,v 1.7 2013/04/17 18:40:58 tedu Exp $
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libc/stdlib/strtonum.c 270033 2014-08-16 01:03:51Z pfg $");
 
 #include <errno.h>
 #include <limits.h>
 #include <stdlib.h>
 
-#define INVALID 	1
-#define TOOSMALL 	2
-#define TOOLARGE 	3
+#define	INVALID		1
+#define	TOOSMALL	2
+#define	TOOLARGE	3
 
 long long
 strtonum(const char *numstr, long long minval, long long maxval,
@@ -33,8 +34,8 @@
     const char **errstrp)
 {
 	long long ll = 0;
+	int error = 0;
 	char *ep;
-	int error = 0;
 	struct errval {
 		const char *errstr;
 		int err;
@@ -47,9 +48,9 @@
 
 	ev[0].err = errno;
 	errno = 0;
-	if (minval > maxval)
+	if (minval > maxval) {
 		error = INVALID;
-	else {
+	} else {
 		ll = strtoll(numstr, &ep, 10);
 		if (errno == EINVAL || numstr == ep || *ep != '\0')
 			error = INVALID;