[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/24] util/cutils: Clean up control flow around qemu
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 08/24] util/cutils: Clean up control flow around qemu_strtol() a bit |
Date: |
Thu, 23 Feb 2017 20:53:46 +0100 |
Reorder check_strtox_error() to make it obvious that we always store
through a non-null @endptr.
Transform
if (some error) {
error case ...
err = value for error case;
} else {
normal case ...
err = value for normal case;
}
return err;
to
if (some error) {
error case ...
return value for error case;
}
normal case ...
return value for normal case;
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
---
util/cutils.c | 89 ++++++++++++++++++++++++++++++-----------------------------
1 file changed, 45 insertions(+), 44 deletions(-)
diff --git a/util/cutils.c b/util/cutils.c
index 0fb0f82..6397424 100644
--- a/util/cutils.c
+++ b/util/cutils.c
@@ -265,15 +265,20 @@ int64_t qemu_strtosz(const char *nptr, char **end)
static int check_strtox_error(const char *nptr, char *ep,
const char **endptr, int libc_errno)
{
- if (libc_errno == 0 && ep == nptr) {
- libc_errno = EINVAL;
- }
- if (!endptr && *ep) {
- return -EINVAL;
- }
if (endptr) {
*endptr = ep;
}
+
+ /* Turn "no conversion" into an error */
+ if (libc_errno == 0 && ep == nptr) {
+ return -EINVAL;
+ }
+
+ /* Fail when we're expected to consume the string, but didn't */
+ if (!endptr && *ep) {
+ return -EINVAL;
+ }
+
return -libc_errno;
}
@@ -305,18 +310,17 @@ int qemu_strtol(const char *nptr, const char **endptr,
int base,
long *result)
{
char *ep;
- int err = 0;
+
if (!nptr) {
if (endptr) {
*endptr = nptr;
}
- err = -EINVAL;
- } else {
- errno = 0;
- *result = strtol(nptr, &ep, base);
- err = check_strtox_error(nptr, ep, endptr, errno);
+ return -EINVAL;
}
- return err;
+
+ errno = 0;
+ *result = strtol(nptr, &ep, base);
+ return check_strtox_error(nptr, ep, endptr, errno);
}
/**
@@ -348,22 +352,21 @@ int qemu_strtoul(const char *nptr, const char **endptr,
int base,
unsigned long *result)
{
char *ep;
- int err = 0;
+
if (!nptr) {
if (endptr) {
*endptr = nptr;
}
- err = -EINVAL;
- } else {
- errno = 0;
- *result = strtoul(nptr, &ep, base);
- /* Windows returns 1 for negative out-of-range values. */
- if (errno == ERANGE) {
- *result = -1;
- }
- err = check_strtox_error(nptr, ep, endptr, errno);
+ return -EINVAL;
}
- return err;
+
+ errno = 0;
+ *result = strtoul(nptr, &ep, base);
+ /* Windows returns 1 for negative out-of-range values. */
+ if (errno == ERANGE) {
+ *result = -1;
+ }
+ return check_strtox_error(nptr, ep, endptr, errno);
}
/**
@@ -376,19 +379,18 @@ int qemu_strtoi64(const char *nptr, const char **endptr,
int base,
int64_t *result)
{
char *ep;
- int err = 0;
+
if (!nptr) {
if (endptr) {
*endptr = nptr;
}
- err = -EINVAL;
- } else {
- errno = 0;
- /* FIXME This assumes int64_t is long long */
- *result = strtoll(nptr, &ep, base);
- err = check_strtox_error(nptr, ep, endptr, errno);
+ return -EINVAL;
}
- return err;
+
+ errno = 0;
+ /* FIXME This assumes int64_t is long long */
+ *result = strtoll(nptr, &ep, base);
+ return check_strtox_error(nptr, ep, endptr, errno);
}
/**
@@ -400,23 +402,22 @@ int qemu_strtou64(const char *nptr, const char **endptr,
int base,
uint64_t *result)
{
char *ep;
- int err = 0;
+
if (!nptr) {
if (endptr) {
*endptr = nptr;
}
- err = -EINVAL;
- } else {
- errno = 0;
- /* FIXME This assumes uint64_t is unsigned long long */
- *result = strtoull(nptr, &ep, base);
- /* Windows returns 1 for negative out-of-range values. */
- if (errno == ERANGE) {
- *result = -1;
- }
- err = check_strtox_error(nptr, ep, endptr, errno);
+ return -EINVAL;
}
- return err;
+
+ errno = 0;
+ /* FIXME This assumes uint64_t is unsigned long long */
+ *result = strtoull(nptr, &ep, base);
+ /* Windows returns 1 for negative out-of-range values. */
+ if (errno == ERANGE) {
+ *result = -1;
+ }
+ return check_strtox_error(nptr, ep, endptr, errno);
}
/**
--
2.7.4
- [Qemu-devel] [PULL 19/24] test-cutils: Drop suffix from test_qemu_strtosz_simple(), (continued)
- [Qemu-devel] [PULL 19/24] test-cutils: Drop suffix from test_qemu_strtosz_simple(), Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 12/24] test-cutils: Cover qemu_strtosz() with trailing crap, Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 03/24] test-cutils: Add missing qemu_strtol()... endptr checks, Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 09/24] option: Fix to reject invalid and overflowing numbers, Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 02/24] option: Assert value string isn't null, Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 14/24] util/cutils: New qemu_strtosz_metric(), Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 13/24] test-cutils: Cover qemu_strtosz() around range limits, Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 24/24] option: Fix checking of sizes for overflow and trailing crap, Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 06/24] util/cutils: Rename qemu_strtoll(), qemu_strtoull(), Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 07/24] util/cutils: Clean up variable names around qemu_strtol(), Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 08/24] util/cutils: Clean up control flow around qemu_strtol() a bit,
Markus Armbruster <=
- [Qemu-devel] [PULL 21/24] util/cutils: Let qemu_strtosz*() optionally reject trailing crap, Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 15/24] util/cutils: Rename qemu_strtosz() to qemu_strtosz_MiB(), Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 17/24] util/cutils: Drop QEMU_STRTOSZ_DEFSUFFIX_* macros, Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 20/24] qemu-img: Wrap cvtnum() around qemu_strtosz(), Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 04/24] test-cutils: Clean up qemu_strtoul() result checks, Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 01/24] test-qemu-opts: Cover qemu_opts_parse(), Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 16/24] util/cutils: New qemu_strtosz(), Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 18/24] test-cutils: Use qemu_strtosz() more often, Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 05/24] util/cutils: Rewrite documentation of qemu_strtol() & friends, Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 22/24] util/cutils: Return qemu_strtosz*() error and value separately, Markus Armbruster, 2017/02/23