Minor style tweaks.

Obtained from:	OpenBSD (CVS rev. 1.7)
MFC after:	3 days
This commit is contained in:
Pedro F. Giffuni 2014-08-13 03:44:30 +00:00
parent 9c851217b6
commit ef01caf5cb

View File

@ -14,7 +14,7 @@
* 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>
@ -24,17 +24,17 @@ __FBSDID("$FreeBSD$");
#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,
const char **errstrp)
{
long long ll = 0;
char *ep;
int error = 0;
char *ep;
struct errval {
const char *errstr;
int err;
@ -47,9 +47,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 (errno == EINVAL || numstr == ep || *ep != '\0')
error = INVALID;