From afc9c1a23a139b0ed1bba2c375ca27ebd278c642 Mon Sep 17 00:00:00 2001 From: Petri Lehtinen Date: Thu, 1 Oct 2009 20:59:59 +0300 Subject: Relax Autoconf version prereq From 2.63 to 2.59, which is more widely supported. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 78d4c74..570c9f5 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_PREREQ([2.63]) +AC_PREREQ([2.59]) AC_INIT([jansson], [1.0.3], [petri@digip.org]) AM_INIT_AUTOMAKE([1.10 foreign]) -- cgit v1.1 From 9c5a8430dbb05f5308ab19fbd0a26d92483b7118 Mon Sep 17 00:00:00 2001 From: Petri Lehtinen Date: Thu, 1 Oct 2009 21:52:12 +0300 Subject: Make it compile on platforms where char is unsigned Linux on powerpc seems to be one such platform. --- src/dump.c | 2 +- src/load.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/dump.c b/src/dump.c index 4831873..28c00b9 100644 --- a/src/dump.c +++ b/src/dump.c @@ -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) { diff --git a/src/load.c b/src/load.c index 5175f35..4134182 100644 --- a/src/load.c +++ b/src/load.c @@ -135,7 +135,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; @@ -519,7 +519,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 -- cgit v1.1 From 19588c2d694b85aa99c864a5f7abe316e46ab548 Mon Sep 17 00:00:00 2001 From: Petri Lehtinen Date: Tue, 6 Oct 2009 13:22:26 +0300 Subject: Fix a few more compilation issues These were left out from the previous commit. --- src/load.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/load.c b/src/load.c index 4134182..3f41795 100644 --- a/src/load.c +++ b/src/load.c @@ -258,14 +258,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') -- cgit v1.1 From 30015bde90a0de993b4e098cac49315b03bc4e97 Mon Sep 17 00:00:00 2001 From: Petri Lehtinen Date: Sat, 10 Oct 2009 21:16:13 +0300 Subject: Remove config.h.in It doesn't have to be in version control. --- .gitignore | 1 + config.h.in | 59 ----------------------------------------------------------- 2 files changed, 1 insertion(+), 59 deletions(-) delete mode 100644 config.h.in diff --git a/.gitignore b/.gitignore index 0d4df9e..a2baa14 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ aclocal.m4 autom4te.cache config.guess config.h +config.h.in config.log config.status config.sub diff --git a/config.h.in b/config.h.in deleted file mode 100644 index bcc3ed3..0000000 --- a/config.h.in +++ /dev/null @@ -1,59 +0,0 @@ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* Define to 1 if you have the header file. */ -#undef HAVE_DLFCN_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR - -/* Name of package */ -#undef PACKAGE - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Version number of package */ -#undef VERSION -- cgit v1.1 From bad16ea52a98daa21afa8f05dcabd95bf74221f3 Mon Sep 17 00:00:00 2001 From: Petri Lehtinen Date: Sat, 10 Oct 2009 22:54:05 +0300 Subject: Fix API tests for object Because of a typo in test/testprogs/Makefile.am, the tests for object were never compiled or run. --- test/testprogs/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/testprogs/Makefile.am b/test/testprogs/Makefile.am index b7b7e91..57f0ded 100644 --- a/test/testprogs/Makefile.am +++ b/test/testprogs/Makefile.am @@ -2,7 +2,7 @@ check_PROGRAMS = test_array test_number test_object test_array_SOURCES = test_array.c util.h test_number_SOURCES = test_number.c util.h -test_object_SOURCES = test_number.c util.h +test_object_SOURCES = test_object.c util.h AM_CPPFLAGS = -I$(top_srcdir)/src AM_CFLAGS = -Wall -Werror -- cgit v1.1 From 12cd4e8c093476b596012a7f5f4840fac69d1605 Mon Sep 17 00:00:00 2001 From: Petri Lehtinen Date: Sun, 11 Oct 2009 21:30:12 +0300 Subject: jansson 1.0.4 --- CHANGES | 7 +++++++ configure.ac | 2 +- doc/conf.py | 2 +- src/Makefile.am | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index b755ca0..5aaacb5 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,10 @@ +Version 1.0.4, released 2009-10-11 + +* Relax Autoconf version requirement to 2.59 +* Make Jansson compile on platforms where plain char is unsigned +* Fix API tests for object + + Version 1.0.3, released 2009-09-14 * Check for integer and real overflows and underflows in decoder diff --git a/configure.ac b/configure.ac index 570c9f5..009e0fb 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.59]) -AC_INIT([jansson], [1.0.3], [petri@digip.org]) +AC_INIT([jansson], [1.0.4], [petri@digip.org]) AM_INIT_AUTOMAKE([1.10 foreign]) diff --git a/doc/conf.py b/doc/conf.py index 4d6bb7f..355c72f 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -52,7 +52,7 @@ copyright = u'2009, Petri Lehtinen' # The short X.Y version. version = '1.0' # The full version, including alpha/beta/rc tags. -release = '1.0.3' +release = '1.0.4' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/src/Makefile.am b/src/Makefile.am index 04dfae0..9c4d3f8 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 -std=c99 -- cgit v1.1