mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-21 06:49:35 +00:00
json: Update jsmn library to upstream commit 053d3cd
Update our embedded version of the jsmn library to upstream commit 053d3cd (Merge pull request #175 from pks-t/pks/struct-type, 2020-04-02). Signed-off-by: Patrick Steinhardt <ps@pks.im> Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
1 parent
46d76f8fef
commit
3b81607b55
1 file changed
+5
-2
@@ -66,7 +66,7 @@ enum jsmnerr {
|
|||||||
* start start position in JSON data string
|
* start start position in JSON data string
|
||||||
* end end position in JSON data string
|
* end end position in JSON data string
|
||||||
*/
|
*/
|
||||||
typedef struct {
|
typedef struct jsmntok {
|
||||||
jsmntype_t type;
|
jsmntype_t type;
|
||||||
int start;
|
int start;
|
||||||
int end;
|
int end;
|
||||||
@@ -80,7 +80,7 @@ typedef struct {
|
|||||||
* JSON parser. Contains an array of token blocks available. Also stores
|
* JSON parser. Contains an array of token blocks available. Also stores
|
||||||
* the string being parsed now and current position in that string.
|
* the string being parsed now and current position in that string.
|
||||||
*/
|
*/
|
||||||
typedef struct {
|
typedef struct jsmn_parser {
|
||||||
unsigned int pos; /* offset in the JSON string */
|
unsigned int pos; /* offset in the JSON string */
|
||||||
unsigned int toknext; /* next token to allocate */
|
unsigned int toknext; /* next token to allocate */
|
||||||
int toksuper; /* superior token node, e.g. parent object or array */
|
int toksuper; /* superior token node, e.g. parent object or array */
|
||||||
@@ -154,6 +154,9 @@ static int jsmn_parse_primitive(jsmn_parser *parser, const char *js,
|
|||||||
case ']':
|
case ']':
|
||||||
case '}':
|
case '}':
|
||||||
goto found;
|
goto found;
|
||||||
|
default:
|
||||||
|
/* to quiet a warning from gcc*/
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
if (js[parser->pos] < 32 || js[parser->pos] >= 127) {
|
if (js[parser->pos] < 32 || js[parser->pos] >= 127) {
|
||||||
parser->pos = start;
|
parser->pos = start;
|
||||||
|
|||||||
Reference in new issue
Block a user