ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

util/cutils: Clean up variable names around qemu_strtol() 

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 <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <1487708048-2131-8-git-send-email-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2017-02-21 21:13:51 +01:00
parent b30d188677
commit 717adf9609
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
util/cutils.c
View File

@ -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, static int check_strtox_error(const char *nptr, char *ep,
int err) const char **endptr, int libc_errno)
{ {
if (err == 0 && endptr == p) { if (libc_errno == 0 && ep == nptr) {
err = EINVAL; libc_errno = EINVAL;
} }
if (!next && *endptr) { if (!endptr && *ep) {
return -EINVAL; return -EINVAL;
} }
if (next) { if (endptr) {
*next = 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, int qemu_strtol(const char *nptr, const char **endptr, int base,
long *result) long *result)
{ {
char *p; char *ep;
int err = 0; int err = 0;
if (!nptr) { if (!nptr) {
if (endptr) { if (endptr) {
@ -313,8 +313,8 @@ int qemu_strtol(const char *nptr, const char **endptr, int base,
err = -EINVAL; err = -EINVAL;
} else { } else {
errno = 0; errno = 0;
*result = strtol(nptr, &p, base); *result = strtol(nptr, &ep, base);
err = check_strtox_error(nptr, p, endptr, errno); err = check_strtox_error(nptr, ep, endptr, errno);
} }
return err; 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, int qemu_strtoul(const char *nptr, const char **endptr, int base,
unsigned long *result) unsigned long *result)
{ {
char *p; char *ep;
int err = 0; int err = 0;
if (!nptr) { if (!nptr) {
if (endptr) { if (endptr) {
@ -356,12 +356,12 @@ int qemu_strtoul(const char *nptr, const char **endptr, int base,
err = -EINVAL; err = -EINVAL;
} else { } else {
errno = 0; errno = 0;
*result = strtoul(nptr, &p, base); *result = strtoul(nptr, &ep, base);
/* Windows returns 1 for negative out-of-range values. */ /* Windows returns 1 for negative out-of-range values. */
if (errno == ERANGE) { if (errno == ERANGE) {
*result = -1; *result = -1;
} }
err = check_strtox_error(nptr, p, endptr, errno); err = check_strtox_error(nptr, ep, endptr, errno);
} }
return err; 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, int qemu_strtoi64(const char *nptr, const char **endptr, int base,
int64_t *result) int64_t *result)
{ {
char *p; char *ep;
int err = 0; int err = 0;
if (!nptr) { if (!nptr) {
if (endptr) { if (endptr) {
@ -385,8 +385,8 @@ int qemu_strtoi64(const char *nptr, const char **endptr, int base,
} else { } else {
errno = 0; errno = 0;
/* FIXME This assumes int64_t is long long */ /* FIXME This assumes int64_t is long long */
*result = strtoll(nptr, &p, base); *result = strtoll(nptr, &ep, base);
err = check_strtox_error(nptr, p, endptr, errno); err = check_strtox_error(nptr, ep, endptr, errno);
} }
return err; 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, int qemu_strtou64(const char *nptr, const char **endptr, int base,
uint64_t *result) uint64_t *result)
{ {
char *p; char *ep;
int err = 0; int err = 0;
if (!nptr) { if (!nptr) {
if (endptr) { if (endptr) {
@ -409,12 +409,12 @@ int qemu_strtou64(const char *nptr, const char **endptr, int base,
} else { } else {
errno = 0; errno = 0;
/* FIXME This assumes uint64_t is unsigned long long */ /* 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. */ /* Windows returns 1 for negative out-of-range values. */
if (errno == ERANGE) { if (errno == ERANGE) {
*result = -1; *result = -1;
} }
err = check_strtox_error(nptr, p, endptr, errno); err = check_strtox_error(nptr, ep, endptr, errno);
} }
return err; return err;
} }