util/cutils: Rewrite documentation of qemu_strtol() & friends

Fixes the following documentation bugs:

* Fails to document that null @nptr is safe.

* Fails to document that we return -EINVAL when no conversion could be
performed (commit 47d4be1).

* Confuses long long with int64_t, and unsigned long long with
uint64_t.

* Claims the unsigned conversions can underflow. They can't.

While there, mark problematic assumptions that int64_t is long long,
and uint64_t is unsigned long long with FIXME comments.

Backports commit 4295f879becfbbb9f4330489311586b96915d920 from qemu
This commit is contained in:
Markus Armbruster 2018-03-02 08:37:55 -05:00 committed by Lioncash
parent 9d1937f25d
commit ac34d92d09
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7

View file

@ -214,9 +214,6 @@ int64_t qemu_strtosz(const char *nptr, char **end)
static int check_strtox_error(const char *p, char *endptr, const char **next, static int check_strtox_error(const char *p, char *endptr, const char **next,
int err) int err)
{ {
/* If no conversion was performed, prefer BSD behavior over glibc
* behavior.
*/
if (err == 0 && endptr == p) { if (err == 0 && endptr == p) {
err = EINVAL; err = EINVAL;
} }
@ -230,30 +227,28 @@ static int check_strtox_error(const char *p, char *endptr, const char **next,
} }
/** /**
* QEMU wrappers for strtol(), strtoll(), strtoul(), strotull() C functions. * Convert string @nptr to a long integer, and store it in @result.
* *
* Convert ASCII string @nptr to a long integer value * This is a wrapper around strtol() that is harder to misuse.
* from the given @base. Parameters @nptr, @endptr, @base * Semantics of @nptr, @endptr, @base match strtol() with differences
* follows same semantics as strtol() C function. * noted below.
* *
* Unlike from strtol() function, if @endptr is not NULL, this * @nptr may be null, and no conversion is performed then.
* function will return -EINVAL whenever it cannot fully convert
* the string in @nptr with given @base to a long. This function returns
* the result of the conversion only through the @result parameter.
* *
* If NULL is passed in @endptr, then the whole string in @ntpr * If no conversion is performed, store @nptr in *@endptr and return
* is a number otherwise it returns -EINVAL. * -EINVAL.
* *
* RETURN VALUE * If @endptr is null, and the string isn't fully converted, return
* Unlike from strtol() function, this wrapper returns either * -EINVAL. This is the case when the pointer that would be stored in
* -EINVAL or the errno set by strtol() function (e.g -ERANGE). * a non-null @endptr points to a character other than '\0'.
* If the conversion overflows, -ERANGE is returned, and @result *
* is set to the max value of the desired type * If the conversion overflows @result, store LONG_MAX in @result,
* (e.g. LONG_MAX, LLONG_MAX, ULONG_MAX, ULLONG_MAX). If the case * and return -ERANGE.
* of underflow, -ERANGE is returned, and @result is set to the min *
* value of the desired type. For strtol(), strtoll(), @result is set to * If the conversion underflows @result, store LONG_MIN in @result,
* LONG_MIN, LLONG_MIN, respectively, and for strtoul(), strtoull() it * and return -ERANGE.
* is set to 0. *
* Else store the converted value in @result, and return zero.
*/ */
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)
@ -274,17 +269,29 @@ int qemu_strtol(const char *nptr, const char **endptr, int base,
} }
/** /**
* Converts ASCII string to an unsigned long integer. * Convert string @nptr to an unsigned long, and store it in @result.
* *
* If string contains a negative number, value will be converted to * This is a wrapper around strtoul() that is harder to misuse.
* the unsigned representation of the signed value, unless the original * Semantics of @nptr, @endptr, @base match strtoul() with differences
* (nonnegated) value would overflow, in this case, it will set @result * noted below.
* to ULONG_MAX, and return ERANGE.
* *
* The same behavior holds, for qemu_strtoull() but sets @result to * @nptr may be null, and no conversion is performed then.
* ULLONG_MAX instead of ULONG_MAX.
* *
* See qemu_strtol() documentation for more info. * If no conversion is performed, store @nptr in *@endptr and return
* -EINVAL.
*
* If @endptr is null, and the string isn't fully converted, return
* -EINVAL. This is the case when the pointer that would be stored in
* a non-null @endptr points to a character other than '\0'.
*
* If the conversion overflows @result, store ULONG_MAX in @result,
* and return -ERANGE.
*
* Else store the converted value in @result, and return zero.
*
* Note that a number with a leading minus sign gets converted without
* the minus sign, checked for overflow (see above), then negated (in
* @result's type). This is exactly how strtoul() works.
*/ */
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)
@ -309,9 +316,10 @@ int qemu_strtoul(const char *nptr, const char **endptr, int base,
} }
/** /**
* Converts ASCII string to a long long integer. * Convert string @nptr to an int64_t.
* *
* See qemu_strtol() documentation for more info. * Works like qemu_strtol(), except it stores INT64_MAX on overflow,
* and INT_MIN on underflow.
*/ */
int qemu_strtoll(const char *nptr, const char **endptr, int base, int qemu_strtoll(const char *nptr, const char **endptr, int base,
int64_t *result) int64_t *result)
@ -325,6 +333,7 @@ int qemu_strtoll(const char *nptr, const char **endptr, int base,
err = -EINVAL; err = -EINVAL;
} else { } else {
errno = 0; errno = 0;
/* FIXME This assumes int64_t is long long */
*result = strtoll(nptr, &p, base); *result = strtoll(nptr, &p, base);
err = check_strtox_error(nptr, p, endptr, errno); err = check_strtox_error(nptr, p, endptr, errno);
} }
@ -332,9 +341,9 @@ int qemu_strtoll(const char *nptr, const char **endptr, int base,
} }
/** /**
* Converts ASCII string to an unsigned long long integer. * Convert string @nptr to an uint64_t.
* *
* See qemu_strtol() documentation for more info. * Works like qemu_strtoul(), except it stores UINT64_MAX on overflow.
*/ */
int qemu_strtoull(const char *nptr, const char **endptr, int base, int qemu_strtoull(const char *nptr, const char **endptr, int base,
uint64_t *result) uint64_t *result)
@ -348,6 +357,7 @@ int qemu_strtoull(const char *nptr, const char **endptr, int base,
err = -EINVAL; err = -EINVAL;
} else { } else {
errno = 0; errno = 0;
/* FIXME This assumes uint64_t is unsigned long long */
*result = strtoull(nptr, &p, base); *result = strtoull(nptr, &p, 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) {