diff --git a/ChangeLog.md b/ChangeLog.md index 193a115..60bada4 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -16,6 +16,7 @@ All notable changes to the project are documented in this file. support for circular queues (CIRCLEQ). - Update `strlcpy.c` to OpenBSD v1.12, readability fixes. - Update `strlcat.c` to OpenBSD v1.14, readability fixes. +- Update `strtonum.c` to OpenBSD v1.7, tiniest of style tweaks. [v1.2.0][] - 2015-11-23 diff --git a/strtonum.c b/strtonum.c index 73ebdbe..db8d82b 100644 --- a/strtonum.c +++ b/strtonum.c @@ -1,4 +1,4 @@ -/* $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 $ */ /* * Copyright (c) 2004 Ted Unangst and Todd Miller @@ -22,17 +22,17 @@ #include #ifndef strtonum -#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, const char **errstrp) { long long ll = 0; - char *ep; int error = 0; + char *ep; struct errval { const char *errstr; int err; @@ -45,9 +45,9 @@ strtonum(const char *numstr, long long minval, long long maxval, ev[0].err = errno; errno = 0; - if (minval > maxval) + if (minval > maxval) { error = INVALID; - else { + } else { ll = strtoll(numstr, &ep, 10); if (numstr == ep || *ep != '\0') error = INVALID;