mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-10-14 23:13:30 +00:00
util/cutils: Turn FIXME comment into QEMU_BUILD_BUG_ON()
qemu_strtoi64() assumes int64_t is long long. This is marked FIXME. Replace by a QEMU_BUILD_BUG_ON() to avoid surprises. Same for qemu_strtou64(). Fix a typo in qemu_strtoul()'s contract while there. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20191125133846.27790-2-armbru@redhat.com> [lv: removed trailing whitespace] Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
parent
f8b345e414
commit
369276ebf3
|
@ -542,7 +542,7 @@ int qemu_strtoul(const char *nptr, const char **endptr, int base,
|
||||||
* Convert string @nptr to an int64_t.
|
* Convert string @nptr to an int64_t.
|
||||||
*
|
*
|
||||||
* Works like qemu_strtol(), except it stores INT64_MAX on overflow,
|
* Works like qemu_strtol(), except it stores INT64_MAX on overflow,
|
||||||
* and INT_MIN on underflow.
|
* and INT64_MIN on underflow.
|
||||||
*/
|
*/
|
||||||
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)
|
||||||
|
@ -557,8 +557,9 @@ int qemu_strtoi64(const char *nptr, const char **endptr, int base,
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* This assumes int64_t is long long TODO relax */
|
||||||
|
QEMU_BUILD_BUG_ON(sizeof(int64_t) != sizeof(long long));
|
||||||
errno = 0;
|
errno = 0;
|
||||||
/* FIXME This assumes int64_t is long long */
|
|
||||||
*result = strtoll(nptr, &ep, base);
|
*result = strtoll(nptr, &ep, base);
|
||||||
return check_strtox_error(nptr, ep, endptr, errno);
|
return check_strtox_error(nptr, ep, endptr, errno);
|
||||||
}
|
}
|
||||||
|
@ -581,8 +582,9 @@ int qemu_strtou64(const char *nptr, const char **endptr, int base,
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* This assumes uint64_t is unsigned long long TODO relax */
|
||||||
|
QEMU_BUILD_BUG_ON(sizeof(uint64_t) != sizeof(unsigned long long));
|
||||||
errno = 0;
|
errno = 0;
|
||||||
/* FIXME This assumes uint64_t is unsigned long long */
|
|
||||||
*result = strtoull(nptr, &ep, 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) {
|
||||||
|
|
Loading…
Reference in a new issue