Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed warnings from -Wconversion #231

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed warnings from -Wconversion #231

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions jsmn.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ static int jsmn_parse_primitive(jsmn_parser *parser, const char *js,
const size_t len, jsmntok_t *tokens,
const size_t num_tokens) {
jsmntok_t *token;
int start;
unsigned int start;

start = parser->pos;

Expand Down Expand Up @@ -179,7 +179,7 @@ static int jsmn_parse_primitive(jsmn_parser *parser, const char *js,
parser->pos = start;
return JSMN_ERROR_NOMEM;
}
jsmn_fill_token(token, JSMN_PRIMITIVE, start, parser->pos);
jsmn_fill_token(token, JSMN_PRIMITIVE, (int)start, (int)parser->pos);
#ifdef JSMN_PARENT_LINKS
token->parent = parser->toksuper;
#endif
Expand All @@ -195,7 +195,7 @@ static int jsmn_parse_string(jsmn_parser *parser, const char *js,
const size_t num_tokens) {
jsmntok_t *token;

int start = parser->pos;
unsigned int start = parser->pos;

/* Skip starting quote */
parser->pos++;
Expand All @@ -213,7 +213,7 @@ static int jsmn_parse_string(jsmn_parser *parser, const char *js,
parser->pos = start;
return JSMN_ERROR_NOMEM;
}
jsmn_fill_token(token, JSMN_STRING, start + 1, parser->pos);
jsmn_fill_token(token, JSMN_STRING, (int)(start + 1), (int)parser->pos);
#ifdef JSMN_PARENT_LINKS
token->parent = parser->toksuper;
#endif
Expand Down Expand Up @@ -270,7 +270,7 @@ JSMN_API int jsmn_parse(jsmn_parser *parser, const char *js, const size_t len,
int r;
int i;
jsmntok_t *token;
int count = parser->toknext;
unsigned int count = parser->toknext;

for (; parser->pos < len && js[parser->pos] != '\0'; parser->pos++) {
char c;
Expand Down Expand Up @@ -302,8 +302,8 @@ JSMN_API int jsmn_parse(jsmn_parser *parser, const char *js, const size_t len,
#endif
}
token->type = (c == '{' ? JSMN_OBJECT : JSMN_ARRAY);
token->start = parser->pos;
parser->toksuper = parser->toknext - 1;
token->start = (int)parser->pos;
parser->toksuper = (int)parser->toknext - 1;
break;
case '}':
case ']':
Expand Down Expand Up @@ -334,14 +334,14 @@ JSMN_API int jsmn_parse(jsmn_parser *parser, const char *js, const size_t len,
token = &tokens[token->parent];
}
#else
for (i = parser->toknext - 1; i >= 0; i--) {
for (i = (int)parser->toknext - 1; i >= 0; i--) {
token = &tokens[i];
if (token->start != -1 && token->end == -1) {
if (token->type != type) {
return JSMN_ERROR_INVAL;
}
parser->toksuper = -1;
token->end = parser->pos + 1;
token->end = (int)(parser->pos + 1);
break;
}
}
Expand Down Expand Up @@ -374,7 +374,7 @@ JSMN_API int jsmn_parse(jsmn_parser *parser, const char *js, const size_t len,
case ' ':
break;
case ':':
parser->toksuper = parser->toknext - 1;
parser->toksuper = (int)parser->toknext - 1;
break;
case ',':
if (tokens != NULL && parser->toksuper != -1 &&
Expand All @@ -383,7 +383,7 @@ JSMN_API int jsmn_parse(jsmn_parser *parser, const char *js, const size_t len,
#ifdef JSMN_PARENT_LINKS
parser->toksuper = tokens[parser->toksuper].parent;
#else
for (i = parser->toknext - 1; i >= 0; i--) {
for (i = (int)parser->toknext - 1; i >= 0; i--) {
if (tokens[i].type == JSMN_ARRAY || tokens[i].type == JSMN_OBJECT) {
if (tokens[i].start != -1 && tokens[i].end == -1) {
parser->toksuper = i;
Expand Down Expand Up @@ -441,15 +441,15 @@ JSMN_API int jsmn_parse(jsmn_parser *parser, const char *js, const size_t len,
}

if (tokens != NULL) {
for (i = parser->toknext - 1; i >= 0; i--) {
for (i = (int)parser->toknext - 1; i >= 0; i--) {
/* Unmatched opened object or array */
if (tokens[i].start != -1 && tokens[i].end == -1) {
return JSMN_ERROR_PART;
}
}
}

return count;
return (int)count;
}

/**
Expand Down