From e176965c1c7db7e7a5310deafbcc9f061b21e384 Mon Sep 17 00:00:00 2001 From: Alexander Klauer Date: Tue, 18 Dec 2012 18:27:39 +0100 Subject: [PATCH 01/12] Ignore valgrind output files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 843fb3c..4a8ace2 100644 --- a/.gitignore +++ b/.gitignore @@ -36,6 +36,7 @@ /tests/test_null /tests/test_printbuf /tests/test_set_serializer +/tests/*.vg.out /Debug /Release *.lo From b670f6f99208c085abaf1713b2b92ea66f9a5d2b Mon Sep 17 00:00:00 2001 From: Alexander Klauer Date: Tue, 18 Dec 2012 18:44:52 +0100 Subject: [PATCH 02/12] -d test is useless as symlinks are dereferenced --- Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 3ffc15f..17d5837 100644 --- a/Makefile.am +++ b/Makefile.am @@ -65,7 +65,6 @@ maintainer-clean-local: if ENABLE_OLDNAME_COMPAT install-data-hook: - test \! -d "$(includedir)/json" || rmdir "$(includedir)/json" test \! -e "$(includedir)/json" || rm "$(includedir)/json" $(LN_S) json-c "$(includedir)/json" From a3a0f5b28d628bd9d4fcd390fa842536c99a023c Mon Sep 17 00:00:00 2001 From: Alexander Klauer Date: Tue, 18 Dec 2012 18:45:39 +0100 Subject: [PATCH 03/12] Need to explicitly remove include/json-c directory --- Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.am b/Makefile.am index 17d5837..fc4479f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -70,6 +70,7 @@ install-data-hook: uninstall-local: rm -f "$(includedir)/json" + rm -rf "$(includedir)/json-c" endif From b1d61d10e1720495bfd0d31c9c95dc6e1d298502 Mon Sep 17 00:00:00 2001 From: Alexander Klauer Date: Tue, 18 Dec 2012 18:46:24 +0100 Subject: [PATCH 04/12] Library is now called libjson-c --- tests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 8057acd..0f06590 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,7 +1,7 @@ include ../Makefile.am.inc -LIBJSON_LA=$(top_builddir)/libjson.la +LIBJSON_LA=$(top_builddir)/libjson-c.la check_PROGRAMS = test1 test1Formatted check_PROGRAMS += test2 test2Formatted From 54d551c8103cae1b45dc1fa6accf6bb1ffcbfc4e Mon Sep 17 00:00:00 2001 From: Alexander Klauer Date: Tue, 18 Dec 2012 18:53:04 +0100 Subject: [PATCH 05/12] Ignore doc dir for now --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 4a8ace2..ce87c33 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ /config.sub /configure /depcomp +/doc /install-sh /json.pc /json-c.pc From 8f58f09c69db2a8396b4f9d952731eda1dd365cb Mon Sep 17 00:00:00 2001 From: Alexander Klauer Date: Wed, 19 Dec 2012 09:38:45 +0100 Subject: [PATCH 06/12] Ignore editor swap files --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index ce87c33..a056b11 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +*~ +*.swp .deps/ .libs/ /aclocal.m4 From 20ef1bd9808ffbe91198a50210479955b69c044a Mon Sep 17 00:00:00 2001 From: Alexander Klauer Date: Wed, 19 Dec 2012 09:40:10 +0100 Subject: [PATCH 07/12] Remove and ignore autogenerated installation instructions --- .gitignore | 1 + INSTALL | 229 ----------------------------------------------------- 2 files changed, 1 insertion(+), 229 deletions(-) delete mode 100644 INSTALL diff --git a/.gitignore b/.gitignore index a056b11..f3b18f1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ *~ *.swp +/INSTALL .deps/ .libs/ /aclocal.m4 diff --git a/INSTALL b/INSTALL deleted file mode 100644 index a4b3414..0000000 --- a/INSTALL +++ /dev/null @@ -1,229 +0,0 @@ -Copyright 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software -Foundation, Inc. - - This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. - -Basic Installation -================== - - These are generic installation instructions. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. (Caching is -disabled by default to prevent problems with accidental use of stale -cache files.) - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You only need -`configure.ac' if you want to change it or regenerate `configure' using -a newer version of `autoconf'. - -The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. - - Running `configure' takes awhile. While running, it prints some - messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package. - - 4. Type `make install' to install the programs and any data files and - documentation. - - 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - -Compilers and Options -===================== - - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' -for details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - - You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. - - If you have to use a `make' that does not support the `VPATH' -variable, you have to compile the package for one architecture at a -time in the source code directory. After you have installed the -package for one architecture, use `make distclean' before reconfiguring -for another architecture. - -Installation Names -================== - - By default, `make install' will install the package's files in -`/usr/local/bin', `/usr/local/man', etc. You can specify an -installation prefix other than `/usr/local' by giving `configure' the -option `--prefix=PATH'. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -give `configure' the option `--exec-prefix=PATH', the package will use -PATH as the prefix for installing programs and libraries. -Documentation and other data files will still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=PATH' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - -Optional Features -================= - - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - -Specifying the System Type -========================== - - There may be some features `configure' cannot figure out -automatically, but needs to determine by the type of machine the package -will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints -a message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the `--target=TYPE' option to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults -================ - - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - - Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -will cause the specified gcc to be used as the C compiler (unless it is -overridden in the site shell script). - -`configure' Invocation -====================== - - `configure' recognizes the following options to control how it -operates. - -`--help' -`-h' - Print a summary of the options to `configure', and exit. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. - From beb12d49e1b7ee4f4adc12d8ea31f543b6ca4823 Mon Sep 17 00:00:00 2001 From: Alexander Klauer Date: Wed, 19 Dec 2012 10:31:39 +0100 Subject: [PATCH 08/12] Make macro json_object_object_foreach multiple-use safe --- json_object.h | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/json_object.h b/json_object.h index 2621112..0ff6584 100644 --- a/json_object.h +++ b/json_object.h @@ -305,28 +305,28 @@ extern void json_object_object_del(struct json_object* obj, const char *key); # define json_object_object_foreach(obj,key,val) \ char *key; \ struct json_object *val; \ - for(struct lh_entry *entry = json_object_get_object(obj)->head, *entry_next = NULL; \ - ({ if(entry) { \ - key = (char*)entry->k; \ - val = (struct json_object*)entry->v; \ - entry_next = entry->next; \ - } ; entry; }); \ - entry = entry_next ) + for(struct lh_entry *entry ## key = json_object_get_object(obj)->head, *entry_next ## key = NULL; \ + ({ if(entry ## key) { \ + key = (char*)entry ## key->k; \ + val = (struct json_object*)entry ## key->v; \ + entry_next ## key = entry ## key->next; \ + } ; entry ## key; }); \ + entry ## key = entry_next ## key ) #else /* ANSI C or MSC */ # define json_object_object_foreach(obj,key,val) \ char *key;\ struct json_object *val; \ - struct lh_entry *entry; \ - struct lh_entry *entry_next = NULL; \ - for(entry = json_object_get_object(obj)->head; \ - (entry ? ( \ - key = (char*)entry->k, \ - val = (struct json_object*)entry->v, \ - entry_next = entry->next, \ - entry) : 0); \ - entry = entry_next) + struct lh_entry *entry ## key; \ + struct lh_entry *entry_next ## key = NULL; \ + for(entry ## key = json_object_get_object(obj)->head; \ + (entry ## key ? ( \ + key = (char*)entry ## key->k, \ + val = (struct json_object*)entry ## key->v, \ + entry_next ## key = entry ## key->next, \ + entry ## key) : 0); \ + entry ## key = entry_next ## key) #endif /* defined(__GNUC__) && !defined(__STRICT_ANSI__) */ From 827a4a97b9ddf6a04ad5a3d7a3c9350edcd00df0 Mon Sep 17 00:00:00 2001 From: Alexander Klauer Date: Wed, 19 Dec 2012 10:46:35 +0100 Subject: [PATCH 09/12] Fixed memory leak in testReplaceExisting --- tests/testReplaceExisting.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/testReplaceExisting.c b/tests/testReplaceExisting.c index 69a7145..8cc6924 100644 --- a/tests/testReplaceExisting.c +++ b/tests/testReplaceExisting.c @@ -72,5 +72,7 @@ int main(int argc, char **argv) retval = 1; } + json_object_put( my_object ); + return 0; } From 57f36ed32a1e679d2ac4c90d12b88e7e2c183b6b Mon Sep 17 00:00:00 2001 From: Alexander Klauer Date: Wed, 19 Dec 2012 10:52:50 +0100 Subject: [PATCH 10/12] Write additional test info to stderr instead of stdout so as not to mar the expected output --- tests/test_null.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test_null.c b/tests/test_null.c index 1f07910..d017c7a 100644 --- a/tests/test_null.c +++ b/tests/test_null.c @@ -41,12 +41,12 @@ int main() int parsed_len = json_object_get_string_len(parsed_str); const char *parsed_cstr = json_object_get_string(parsed_str); int ii; - printf("Re-parsed object string len=%d, chars=[", parsed_len); + fprintf( stderr, "Re-parsed object string len=%d, chars=[", parsed_len); for (ii = 0; ii < parsed_len ; ii++) { - printf("%s%d", (ii ? ", " : ""), (int)parsed_cstr[ii]); + fprintf( stderr, "%s%d", (ii ? ", " : ""), (int)parsed_cstr[ii]); } - printf("]\n"); + fprintf( stderr, "]\n"); json_object_put(parsed_str); } else From 024d86c07ffcd8fef1ba19ac821416281ffb1f8d Mon Sep 17 00:00:00 2001 From: Alexander Klauer Date: Wed, 19 Dec 2012 13:16:38 +0100 Subject: [PATCH 11/12] Prepend DESTDIR to paths for staged installs --- Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index fc4479f..36272f4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -65,12 +65,12 @@ maintainer-clean-local: if ENABLE_OLDNAME_COMPAT install-data-hook: - test \! -e "$(includedir)/json" || rm "$(includedir)/json" - $(LN_S) json-c "$(includedir)/json" + test \! -e "$(DESTDIR)@includedir@json" || rm "$(DESTDIR)@includedir@/json" + $(LN_S) json-c "$(DESTDIR)@includedir@/json" uninstall-local: - rm -f "$(includedir)/json" - rm -rf "$(includedir)/json-c" + rm -f "$(DESTDIR)@includedir@/json" + rm -rf "$(DESTDIR)@includedir@/json-c" endif From 18abf6e5092175e7de27e73c6bb643b2bf57ec7d Mon Sep 17 00:00:00 2001 From: Alexander Klauer Date: Wed, 19 Dec 2012 13:55:02 +0100 Subject: [PATCH 12/12] More warnings, fewer errors, C99 --- Makefile.am.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am.inc b/Makefile.am.inc index b1ebce8..7882fd7 100644 --- a/Makefile.am.inc +++ b/Makefile.am.inc @@ -1,2 +1,2 @@ -AM_CFLAGS = -Wall -Wwrite-strings -Werror -std=gnu99 -D_GNU_SOURCE -D_REENTRANT +AM_CFLAGS = -Wall -Wextra -Wwrite-strings -Wno-unused-parameter -std=c99 -D_GNU_SOURCE -D_REENTRANT