From patchwork Thu Feb 23 19:53:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 731733 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vTlsD2TwRz9s4s for ; Fri, 24 Feb 2017 07:17:36 +1100 (AEDT) Received: from localhost ([::1]:60807 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cgzpU-0001sr-V4 for incoming@patchwork.ozlabs.org; Thu, 23 Feb 2017 15:17:32 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39733) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cgzSs-0001xn-DL for qemu-devel@nongnu.org; Thu, 23 Feb 2017 14:54:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cgzSp-0000oJ-F3 for qemu-devel@nongnu.org; Thu, 23 Feb 2017 14:54:10 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38458) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cgzSp-0000mo-6c for qemu-devel@nongnu.org; Thu, 23 Feb 2017 14:54:07 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 41E2EC04BD55 for ; Thu, 23 Feb 2017 19:54:07 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-55.ams2.redhat.com [10.36.116.55]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1NJs5cb009489 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Thu, 23 Feb 2017 14:54:06 -0500 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 941CC11385E0; Thu, 23 Feb 2017 20:54:02 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Thu, 23 Feb 2017 20:53:45 +0100 Message-Id: <1487879642-16139-8-git-send-email-armbru@redhat.com> In-Reply-To: <1487879642-16139-1-git-send-email-armbru@redhat.com> References: <1487879642-16139-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 23 Feb 2017 19:54:07 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 07/24] util/cutils: Clean up variable names around qemu_strtol() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Name same things the same, different things differently. * qemu_strtol()'s parameter @nptr is called @p in check_strtox_error(). Rename the latter. * qemu_strtol()'s parameter @endptr is called @next in check_strtox_error(). Rename the latter. * qemu_strtol()'s variable @p is called @endptr in check_strtox_error(). Rename both to @ep. * qemu_strtol()'s variable @err is *negative* errno, check_strtox_error()'s parameter @err is *positive*. Rename the latter to @libc_errno. Same for qemu_strtoul(), qemu_strtoi64(), qemu_strtou64(), of course. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Message-Id: <1487708048-2131-8-git-send-email-armbru@redhat.com> --- util/cutils.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/util/cutils.c b/util/cutils.c index 0dc9b28..0fb0f82 100644 --- a/util/cutils.c +++ b/util/cutils.c @@ -260,21 +260,21 @@ int64_t qemu_strtosz(const char *nptr, char **end) } /** - * Helper function for qemu_strto*l() functions. + * Helper function for error checking after strtol() and the like */ -static int check_strtox_error(const char *p, char *endptr, const char **next, - int err) +static int check_strtox_error(const char *nptr, char *ep, + const char **endptr, int libc_errno) { - if (err == 0 && endptr == p) { - err = EINVAL; + if (libc_errno == 0 && ep == nptr) { + libc_errno = EINVAL; } - if (!next && *endptr) { + if (!endptr && *ep) { return -EINVAL; } - if (next) { - *next = endptr; + if (endptr) { + *endptr = ep; } - return -err; + return -libc_errno; } /** @@ -304,7 +304,7 @@ static int check_strtox_error(const char *p, char *endptr, const char **next, int qemu_strtol(const char *nptr, const char **endptr, int base, long *result) { - char *p; + char *ep; int err = 0; if (!nptr) { if (endptr) { @@ -313,8 +313,8 @@ int qemu_strtol(const char *nptr, const char **endptr, int base, err = -EINVAL; } else { errno = 0; - *result = strtol(nptr, &p, base); - err = check_strtox_error(nptr, p, endptr, errno); + *result = strtol(nptr, &ep, base); + err = check_strtox_error(nptr, ep, endptr, errno); } return err; } @@ -347,7 +347,7 @@ int qemu_strtol(const char *nptr, const char **endptr, int base, int qemu_strtoul(const char *nptr, const char **endptr, int base, unsigned long *result) { - char *p; + char *ep; int err = 0; if (!nptr) { if (endptr) { @@ -356,12 +356,12 @@ int qemu_strtoul(const char *nptr, const char **endptr, int base, err = -EINVAL; } else { errno = 0; - *result = strtoul(nptr, &p, base); + *result = strtoul(nptr, &ep, base); /* Windows returns 1 for negative out-of-range values. */ if (errno == ERANGE) { *result = -1; } - err = check_strtox_error(nptr, p, endptr, errno); + err = check_strtox_error(nptr, ep, endptr, errno); } return err; } @@ -375,7 +375,7 @@ int qemu_strtoul(const char *nptr, const char **endptr, int base, int qemu_strtoi64(const char *nptr, const char **endptr, int base, int64_t *result) { - char *p; + char *ep; int err = 0; if (!nptr) { if (endptr) { @@ -385,8 +385,8 @@ int qemu_strtoi64(const char *nptr, const char **endptr, int base, } else { errno = 0; /* FIXME This assumes int64_t is long long */ - *result = strtoll(nptr, &p, base); - err = check_strtox_error(nptr, p, endptr, errno); + *result = strtoll(nptr, &ep, base); + err = check_strtox_error(nptr, ep, endptr, errno); } return err; } @@ -399,7 +399,7 @@ int qemu_strtoi64(const char *nptr, const char **endptr, int base, int qemu_strtou64(const char *nptr, const char **endptr, int base, uint64_t *result) { - char *p; + char *ep; int err = 0; if (!nptr) { if (endptr) { @@ -409,12 +409,12 @@ int qemu_strtou64(const char *nptr, const char **endptr, int base, } else { errno = 0; /* FIXME This assumes uint64_t is unsigned long long */ - *result = strtoull(nptr, &p, base); + *result = strtoull(nptr, &ep, base); /* Windows returns 1 for negative out-of-range values. */ if (errno == ERANGE) { *result = -1; } - err = check_strtox_error(nptr, p, endptr, errno); + err = check_strtox_error(nptr, ep, endptr, errno); } return err; }