@@ -48,10 +48,10 @@ static void free_range(void *range, void *dummy)
static int parse_str_int64(StringInputVisitor *siv, const char *name,
Error **errp)
{
- char *str = (char *) siv->string;
- long long start, end;
+ const char *str = (char *) siv->string;
+ const char *endptr;
+ int64_t start, end;
Range *cur;
- char *endptr;
if (siv->ranges) {
return 0;
@@ -62,9 +62,7 @@ static int parse_str_int64(StringInputVisitor *siv, const char *name,
}
do {
- errno = 0;
- start = strtoll(str, &endptr, 0);
- if (errno == 0 && endptr > str) {
+ if (!qemu_strtoi64(str, &endptr, 0, &start)) {
if (*endptr == '\0') {
cur = g_malloc0(sizeof(*cur));
range_set_bounds(cur, start, start);
@@ -73,11 +71,7 @@ static int parse_str_int64(StringInputVisitor *siv, const char *name,
str = NULL;
} else if (*endptr == '-') {
str = endptr + 1;
- errno = 0;
- end = strtoll(str, &endptr, 0);
- if (errno == 0 && endptr > str && start <= end &&
- (start > INT64_MAX - 65536 ||
- end < start + 65536)) {
+ if (!qemu_strtoi64(str, &endptr, 0, &end) && start < end) {
if (*endptr == '\0') {
cur = g_malloc0(sizeof(*cur));
range_set_bounds(cur, start, end);
The qemu api claims to be easier to use, and the resulting code shows that. Signed-off-by: David Hildenbrand <david@redhat.com> --- qapi/string-input-visitor.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-)