yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-07-07 16:30:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

util/cutils: Turn FIXME comment into QEMU_BUILD_BUG_ON()

Browse source 
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.

Backports commit 369276ebf3cbba419653a19a01b790f3bcf3aea7 from qemu
This commit is contained in:
Markus Armbruster 2020-01-14 08:04:23 -05:00 committed by Lioncash
parent 2952ab497f
commit 2814d68506
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
qemu/util/cutils.c
View file

@ -446,7 +446,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)
@ -460,8 +460,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);
} }
@ -483,8 +484,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) {