diff options
author | Petri Lehtinen <petri@digip.org> | 2009-10-11 21:51:54 +0300 |
---|---|---|
committer | Petri Lehtinen <petri@digip.org> | 2009-10-11 21:51:54 +0300 |
commit | ca7703fbd127a6279e9842a843f317a639db87e2 (patch) | |
tree | 60438f2bd9b15897775bb54faeea5f54dab13d0e /src | |
parent | 1e00cd58a514a61e829e639f1e40dac94a334561 (diff) | |
parent | 12cd4e8c093476b596012a7f5f4840fac69d1605 (diff) | |
download | jansson-ca7703fbd127a6279e9842a843f317a639db87e2.zip jansson-ca7703fbd127a6279e9842a843f317a639db87e2.tar.gz jansson-ca7703fbd127a6279e9842a843f317a639db87e2.tar.bz2 |
Merge branch '1.0'
Conflicts:
configure.ac
doc/conf.py
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 2 | ||||
-rw-r--r-- | src/dump.c | 2 | ||||
-rw-r--r-- | src/load.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index a737c90..36f8467 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -13,6 +13,6 @@ libjansson_la_SOURCES = \ utf.h \ util.h \ value.c -libjansson_la_LDFLAGS = -version-info 0:3:0 +libjansson_la_LDFLAGS = -version-info 0:4:0 AM_CFLAGS = -Wall -Wextra -Werror @@ -70,7 +70,7 @@ static int dump_string(const char *str, dump_func dump, void *data) char seq[7]; int length; - while(*end && *end != '\\' && *end != '"' && (*end < 0 || *end > 0x1F)) + while(*end && *end != '\\' && *end != '"' && (unsigned char)*end > 0x1F) end++; if(end != str) { @@ -134,7 +134,7 @@ static char stream_get(stream_t *stream, json_error_t *error) 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; @@ -257,14 +257,14 @@ static void lex_scan_string(lex_t *lex, json_error_t *error) 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; } - else if(0 <= c && c <= 0x1F) { + else if((unsigned char)c <= 0x1F) { /* control character */ lex_unget_unsave(lex, c); if(c == '\n') @@ -518,7 +518,7 @@ static int lex_scan(lex_t *lex, json_error_t *error) c = lex_get(lex, error); } - if(c == EOF) { + if(c == (char)EOF) { if(lex_eof(lex)) lex->token = TOKEN_EOF; else |