projects
/
jansson.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix indentation
[jansson.git]
/
src
/
load.c
diff --git
a/src/load.c
b/src/load.c
index
8d5a392
..
f004525
100644
(file)
--- a/
src/load.c
+++ b/
src/load.c
@@
-134,7
+134,7
@@
static char stream_get(stream_t *stream, json_error_t *error)
c = stream->buffer[0];
c = stream->buffer[0];
- if(
c < 0 && c !=
EOF)
+ if(
(unsigned char)c >= 0x80 && c != (char)
EOF)
{
/* multi-byte UTF-8 sequence */
int i, count;
{
/* multi-byte UTF-8 sequence */
int i, count;
@@
-257,14
+257,14
@@
static void lex_scan_string(lex_t *lex, json_error_t *error)
c = lex_get_save(lex, error);
while(c != '"') {
c = lex_get_save(lex, error);
while(c != '"') {
- if(c == EOF) {
+ if(c ==
(char)
EOF) {
lex_unget_unsave(lex, c);
if(lex_eof(lex))
error_set(error, lex, "premature end of input");
goto out;
}
lex_unget_unsave(lex, c);
if(lex_eof(lex))
error_set(error, lex, "premature end of input");
goto out;
}
- else if(
0 <= c &&
c <= 0x1F) {
+ else if(
(unsigned char)
c <= 0x1F) {
/* control character */
lex_unget_unsave(lex, c);
if(c == '\n')
/* control character */
lex_unget_unsave(lex, c);
if(c == '\n')
@@
-338,9
+338,10
@@
static void lex_scan_string(lex_t *lex, json_error_t *error)
if(0xDC00 <= value2 && value2 <= 0xDFFF) {
/* valid second surrogate */
if(0xDC00 <= value2 && value2 <= 0xDFFF) {
/* valid second surrogate */
- value = ((value - 0xD800) << 10) +
- (value2 - 0xDC00) +
- 0x10000;
+ value =
+ ((value - 0xD800) << 10) +
+ (value2 - 0xDC00) +
+ 0x10000;
}
else {
/* invalid second surrogate */
}
else {
/* invalid second surrogate */
@@
-505,8
+506,8
@@
static int lex_scan(lex_t *lex, json_error_t *error)
strbuffer_clear(&lex->saved_text);
if(lex->token == TOKEN_STRING) {
strbuffer_clear(&lex->saved_text);
if(lex->token == TOKEN_STRING) {
- free(lex->value.string);
- lex->value.string = NULL;
+
free(lex->value.string);
+
lex->value.string = NULL;
}
c = lex_get(lex, error);
}
c = lex_get(lex, error);
@@
-518,7
+519,7
@@
static int lex_scan(lex_t *lex, json_error_t *error)
c = lex_get(lex, error);
}
c = lex_get(lex, error);
}
- if(c == EOF) {
+ if(c ==
(char)
EOF) {
if(lex_eof(lex))
lex->token = TOKEN_EOF;
else
if(lex_eof(lex))
lex->token = TOKEN_EOF;
else
@@
-744,7
+745,7
@@
static json_t *parse_value(lex_t *lex, json_error_t *error)
break;
case '{':
break;
case '{':
- json = parse_object(lex, error);
+
json = parse_object(lex, error);
break;
case '[':
break;
case '[':