diff options
| author | deraadt@openbsd.org <deraadt@openbsd.org> | 2024-04-02 11:56:58 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2024-04-30 04:16:52 +0200 |
| commit | 8176e1a6c2e6da9361a7abb6fbf6c23c299f495b (patch) | |
| tree | dabf769070b1601bbf6ae35b80e49e97e90daeab /misc.c | |
| parent | upstream: rewrite convtime() to use a isdigit-scanner and (diff) | |
| download | openssh-8176e1a6c2e6da9361a7abb6fbf6c23c299f495b.tar.xz openssh-8176e1a6c2e6da9361a7abb6fbf6c23c299f495b.zip | |
upstream: can shortcut by returning strtonum() value directly; ok
djm
OpenBSD-Commit-ID: 7bb2dd3d6d1f288dac14247d1de446e3d7ba8b8e
Diffstat (limited to '')
| -rw-r--r-- | misc.c | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: misc.c,v 1.191 2024/04/02 09:52:14 deraadt Exp $ */ +/* $OpenBSD: misc.c,v 1.192 2024/04/02 09:56:58 deraadt Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2005-2020 Damien Miller. All rights reserved. @@ -2428,13 +2428,10 @@ const char * atoi_err(const char *nptr, int *val) { const char *errstr = NULL; - long long num; if (nptr == NULL || *nptr == '\0') return "missing"; - num = strtonum(nptr, 0, INT_MAX, &errstr); - if (errstr == NULL) - *val = (int)num; + *val = strtonum(nptr, 0, INT_MAX, &errstr); return errstr; } |