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

json: Simplify parse_string() 

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20180823164025.12553-28-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2018-08-23 18:39:54 +02:00
parent b2da4a4d75
commit de6decfe8e
1 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
qobject/json-parser.c
View File

@ -101,8 +101,7 @@ static int hex2decimal(char ch)
} else if (ch >= 'A' && ch <= 'F') { } else if (ch >= 'A' && ch <= 'F') {
return 10 + (ch - 'A'); return 10 + (ch - 'A');
} }
abort();
return -1;
} }
/** /**
@ -144,7 +143,7 @@ static QString *parse_string(JSONParserContext *ctxt, JSONToken *token)
const char *ptr = token->str; const char *ptr = token->str;
QString *str; QString *str;
char quote; char quote;
int cp; int cp, i;
char *end; char *end;
ssize_t len; ssize_t len;
char utf8_buf[5]; char utf8_buf[5];
@ -159,51 +158,48 @@ static QString *parse_string(JSONParserContext *ctxt, JSONToken *token)
ptr++; ptr++;
switch (*ptr++) { switch (*ptr++) {
case '"': case '"':
qstring_append(str, "\""); qstring_append_chr(str, '"');
break; break;
case '\'': case '\'':
qstring_append(str, "'"); qstring_append_chr(str, '\'');
break; break;
case '\\': case '\\':
qstring_append(str, "\\"); qstring_append_chr(str, '\\');
break; break;
case '/': case '/':
qstring_append(str, "/"); qstring_append_chr(str, '/');
break; break;
case 'b': case 'b':
qstring_append(str, "\b"); qstring_append_chr(str, '\b');
break; break;
case 'f': case 'f':
qstring_append(str, "\f"); qstring_append_chr(str, '\f');
break; break;
case 'n': case 'n':
qstring_append(str, "\n"); qstring_append_chr(str, '\n');
break; break;
case 'r': case 'r':
qstring_append(str, "\r"); qstring_append_chr(str, '\r');
break; break;
case 't': case 't':
qstring_append(str, "\t"); qstring_append_chr(str, '\t');
break; break;
case 'u': { case 'u':
uint16_t unicode_char = 0; cp = 0;
char utf8_char[4];
int i = 0;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
if (qemu_isxdigit(*ptr)) { if (!qemu_isxdigit(*ptr)) {
unicode_char |= hex2decimal(*ptr) << ((3 - i) * 4);
} else {
parse_error(ctxt, token, parse_error(ctxt, token,
"invalid hex escape sequence in string"); "invalid hex escape sequence in string");
goto out; goto out;
} }
cp <<= 4;
cp |= hex2decimal(*ptr);
ptr++; ptr++;
} }
wchar_to_utf8(unicode_char, utf8_char, sizeof(utf8_char)); wchar_to_utf8(cp, utf8_buf, sizeof(utf8_buf));
qstring_append(str, utf8_char); qstring_append(str, utf8_buf);
} break; break;
default: default:
parse_error(ctxt, token, "invalid escape sequence in string"); parse_error(ctxt, token, "invalid escape sequence in string");
goto out; goto out;