Release v1.0.2

Rename bool -> cjbool, fix #71
Change version to 1.0.1
2023-08-10 21:13:26 +03:00 · 2016-11-25 08:22:41 +07:00 · 2016-11-25 08:19:18 +07:00 · 2016-11-20 01:08:54 +07:00 · 2016-11-19 17:50:01 +07:00 · 2016-11-19 17:29:22 +07:00
14 changed files with 964 additions and 552 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ test
 *.patch
 tags
 *.dylib
+build/
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,39 +1,110 @@
+set(CMAKE_LEGACY_CYGWIN_WIN32 0)
 cmake_minimum_required(VERSION 2.8)

-set(PROJ_CJSON cJSON)
+include(GNUInstallDirs)

-project(${PROJ_CJSON} C)
+project(cJSON C)
+
+set(PROJECT_VERSION_MAJOR 1)
+set(PROJECT_VERSION_MINOR 0)
+set(PROJECT_VERSION_PATCH 2)
+set(CJSON_VERSION_SO 1)
+set(CJSON_UTILS_VERSION_SO 1)
+set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
+
+option(ENABLE_CUSTOM_COMPILER_FLAGS ON)
+if (ENABLE_CUSTOM_COMPILER_FLAGS)
+    if(("${CMAKE_C_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_C_COMPILER_ID}" MATCHES "Clang"))
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c89 -pedantic -Wall -Wextra -Werror -Wstrict-prototypes -Wwrite-strings")
+    endif()
+endif()
+
+#variables for pkg-config
+set(prefix "${CMAKE_INSTALL_PREFIX}")
+set(libdir "${CMAKE_INSTALL_LIBDIR}")
+set(version "${PROJECT_VERSION}")
+set(includedir "${CMAKE_INSTALL_INCLUDEDIR}")
+
+option(BUILD_SHARED_LIBS "Build shared libraries" ON)
+option(ENABLE_TARGET_EXPORT "Enable exporting of CMake targets. Disable when it causes problems!" ON)
+
+#cJSON
+set(CJSON_LIB cjson)

 file(GLOB HEADERS cJSON.h)
 set(SOURCES cJSON.c)

-add_library(${PROJ_CJSON} ${HEADERS} ${SOURCES})
+add_library("${CJSON_LIB}" "${HEADERS}" "${SOURCES}")
 if (NOT WIN32)
-	target_link_libraries(${PROJ_CJSON} m)
+    target_link_libraries("${CJSON_LIB}" m)
 endif()

-set(PROJ_CJSON_UTILS cJSON_utils)
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/libcjson.pc.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/libcjson.pc" @ONLY)

-project(${PROJ_CJSON_UTILS} C)
+install(FILES cJSON.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/cjson")
+install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcjson.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+install(TARGETS "${CJSON_LIB}" DESTINATION "${CMAKE_INSTALL_LIBDIR}" EXPORT "${CJSON_LIB}")
+if(ENABLE_TARGET_EXPORT)
+    # export library information for CMake projects
+    install(EXPORT "${CJSON_LIB}" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/cJSON")
+endif()

-file(GLOB HEADERS_UTILS cJSON_Utils.h)
-set(SOURCES_UTILS cJSON_Utils.c)
+set_target_properties("${CJSON_LIB}"
+    PROPERTIES
+        SOVERSION "${CJSON_VERSION_SO}"
+        VERSION "${PROJECT_VERSION}")

-add_library(${PROJ_CJSON_UTILS} ${HEADERS_UTILS} ${SOURCES_UTILS})
-target_link_libraries(${PROJ_CJSON_UTILS} ${PROJ_CJSON})
+#cJSON_Utils
+option(ENABLE_CJSON_UTILS "Enable building the cJSON_Utils library." OFF)
+if(ENABLE_CJSON_UTILS)
+    set(CJSON_UTILS_LIB cjson_utils)

-install (TARGETS ${PROJ_CJSON} DESTINATION lib${LIB_SUFFIX})
-install (FILES cJSON.h DESTINATION include/cJSON)
-install (TARGETS ${PROJ_CJSON_UTILS} DESTINATION lib${LIB_SUFFIX})
-install (FILES cJSON_Utils.h DESTINATION include/cJSON)
+    file(GLOB HEADERS_UTILS cJSON_Utils.h)
+    set(SOURCES_UTILS cJSON_Utils.c)

-option(ENABLE_CJSON_TEST "Enable building cJSON test" OFF)
+    add_library("${CJSON_UTILS_LIB}" "${HEADERS_UTILS}" "${SOURCES_UTILS}")
+    target_link_libraries("${CJSON_UTILS_LIB}" "${CJSON_LIB}")
+
+    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/libcjson_utils.pc.in"
+        "${CMAKE_CURRENT_BINARY_DIR}/libcjson_utils.pc" @ONLY)
+
+    install(TARGETS "${CJSON_UTILS_LIB}" DESTINATION "${CMAKE_INSTALL_LIBDIR}" EXPORT "${CJSON_UTILS_LIB}")
+    install(FILES cJSON_Utils.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/cjson")
+    install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcjson_utils.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+    if(ENABLE_TARGET_EXPORT)
+      # export library information for CMake projects
+      install(EXPORT "${CJSON_UTILS_LIB}" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/cJSON")
+    endif()
+
+    set_target_properties("${CJSON_UTILS_LIB}"
+        PROPERTIES
+            SOVERSION "${CJSON_UTILS_VERSION_SO}"
+            VERSION "${PROJECT_VERSION}")
+endif()
+
+# create the other package config files
+configure_file(
+    cJSONConfig.cmake.in
+    ${PROJECT_BINARY_DIR}/cJSONConfig.cmake @ONLY)
+configure_file(
+    cJSONConfigVersion.cmake.in
+    ${PROJECT_BINARY_DIR}/cJSONConfigVersion.cmake @ONLY)
+
+# Install package config files
+install(FILES ${PROJECT_BINARY_DIR}/cJSONConfig.cmake
+    ${PROJECT_BINARY_DIR}/cJSONConfigVersion.cmake
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/cJSON")
+
+option(ENABLE_CJSON_TEST "Enable building cJSON test" ON)
 if(ENABLE_CJSON_TEST)
-	set(TEST_CJSON cJSON_test)
-	add_executable(${TEST_CJSON} test.c)
-	target_link_libraries(${TEST_CJSON} ${PROJ_CJSON})
+    set(TEST_CJSON cJSON_test)
+    add_executable("${TEST_CJSON}" test.c)
+    target_link_libraries("${TEST_CJSON}" "${CJSON_LIB}")

-	set(TEST_CJSON_UTILS cJSON_test_utils)
-	add_executable(${TEST_CJSON_UTILS} test_utils.c)
-	target_link_libraries(${TEST_CJSON_UTILS} ${PROJ_CJSON_UTILS})
+    if(ENABLE_CJSON_UTILS)
+        set(TEST_CJSON_UTILS cJSON_test_utils)
+        add_executable("${TEST_CJSON_UTILS}" test_utils.c)
+        target_link_libraries("${TEST_CJSON_UTILS}" "${CJSON_UTILS_LIB}")
+    endif()
 endif()
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -0,0 +1,27 @@
+Contributors
+============
+
+* [Ajay Bhargav](https://github.com/ajaybhargav)
+* [Anton Sergeev](https://github.com/anton-sergeev)
+* [Christian Schulze](https://github.com/ChristianSch)
+* [Dave Gamble](https://github.com/DaveGamble)
+* [dieyushi](https://github.com/dieyushi)
+* [Dongwen Huang (黄东文)](https://github.com/DongwenHuang)
+* Eswar Yaganti
+* [Evan Todd](https://github.com/etodd)
+* [Fabrice Fontaine](https://github.com/ffontaine)
+* Ian Mobley
+* Irwan Djadjadi
+* [IvanVoid](https://github.com/npi3pak)
+* [Jonathan Fether](https://github.com/jfether)
+* [Kevin Branigan](https://github.com/kbranigan)
+* [Linus Wallgren](https://github.com/ecksun)
+* [Max Bruckner](https://github.com/FSMaxB)
+* Mike Pontillo
+* Paulo Antonio Alvarez
+* [Rafael Leal Dias](https://github.com/rafaeldias)
+* [Rod Vagg](https://github.com/rvagg)
+* [Roland Meertens](https://github.com/rmeertens)
+* [Weston Schmidt](https://github.com/schmidtw)
+
+And probably more people on [SourceForge](https://sourceforge.net/p/cjson/bugs/search/?q=status%3Aclosed-rejected+or+status%3Aclosed-out-of-date+or+status%3Awont-fix+or+status%3Aclosed-fixed+or+status%3Aclosed&page=0)
--- a/157
+++ b/157
@@ -1,6 +1,15 @@
-OBJ = cJSON.o
-LIBNAME = libcjson
-TESTS = test
+CJSON_OBJ = cJSON.o
+UTILS_OBJ = cJSON_Utils.o
+CJSON_LIBNAME = libcjson
+UTILS_LIBNAME = libcjson_utils
+CJSON_TEST = cJSON_test
+UTILS_TEST = cJSON_test_utils
+
+LDLIBS = -lm
+
+LIBVERSION = 1.0.2
+CJSON_SOVERSION = 1
+UTILS_SOVERSION = 1

 PREFIX ?= /usr/local
 INCLUDE_PATH ?= include/cjson
@@ -11,54 +20,126 @@ INSTALL_LIBRARY_PATH = $(DESTDIR)$(PREFIX)/$(LIBRARY_PATH)

 INSTALL ?= cp -a

-R_CFLAGS = -fpic $(CFLAGS) -Wall -Werror -Wstrict-prototypes -Wwrite-strings -D_POSIX_C_SOURCE=200112L
+R_CFLAGS = -fPIC -std=c89 -pedantic -Wall -Werror -Wstrict-prototypes -Wwrite-strings $(CFLAGS)

-uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo false')
+uname := $(shell sh -c 'uname -s 2>/dev/null || echo false')

-## shared lib
-DYLIBNAME = $(LIBNAME).so 
-DYLIBCMD = $(CC) -shared -o $(DYLIBNAME)
+#library file extensions
+SHARED = so
+STATIC = a

 ## create dynamic (shared) library on Darwin (base OS for MacOSX and IOS)
-ifeq (Darwin, $(uname_S))
-  DYLIBNAME = $(LIBNAME).dylib
-## create dyanmic (shared) library on SunOS
-else ifeq (SunOS, $(uname_S))
-  DYLIBCMD = $(CC) -G -o $(DYLIBNAME)
-  INSTALL = cp -r
+ifeq (Darwin, $(uname))
+	SHARED = dylib
 endif

-## static lib
-STLIBNAME = $(LIBNAME).a
+#cJSON library names
+CJSON_SHARED = $(CJSON_LIBNAME).$(SHARED)
+CJSON_SHARED_VERSION = $(CJSON_LIBNAME).$(SHARED).$(LIBVERSION)
+CJSON_SHARED_SO = $(CJSON_LIBNAME).$(SHARED).$(CJSON_SOVERSION)
+CJSON_STATIC = $(CJSON_LIBNAME).$(STATIC)

-.PHONY: all clean install
+#cJSON_Utils library names
+UTILS_SHARED = $(UTILS_LIBNAME).$(SHARED)
+UTILS_SHARED_VERSION = $(UTILS_LIBNAME).$(SHARED).$(LIBVERSION)
+UTILS_SHARED_SO = $(UTILS_LIBNAME).$(SHARED).$(UTILS_SOVERSION)
+UTILS_STATIC = $(UTILS_LIBNAME).$(STATIC)

-all: $(DYLIBNAME) $(STLIBNAME) $(TESTS)
+SHARED_CMD = $(CC) -shared -o

-$(DYLIBNAME): $(OBJ)
-		$(DYLIBCMD) $< $(LDFLAGS)
-	
-$(STLIBNAME): $(OBJ)
-		$(AR) rcs $@ $<
+.PHONY: all shared static tests clean install

-$(OBJ): cJSON.c cJSON.h 
+all: shared static tests
+
+shared: $(CJSON_SHARED) $(UTILS_SHARED)
+
+static: $(CJSON_STATIC) $(UTILS_STATIC)
+
+tests: $(CJSON_TEST) $(UTILS_TEST)
+
+test: tests
+	./$(CJSON_TEST)
+	./$(UTILS_TEST)

 .c.o:
-		$(CC) -ansi -pedantic -c $(R_CFLAGS) $<
+	$(CC) -ansi -pedantic -c $(R_CFLAGS) $<

-$(TESTS): cJSON.c cJSON.h test.c
-		$(CC)  cJSON.c test.c -o test -lm -I.
+#tests
+#cJSON
+$(CJSON_TEST): cJSON.c cJSON.h test.c
+	$(CC) $^ -o $@ $(LDLIBS) -I.
+#cJSON_Utils
+$(UTILS_TEST): cJSON.c cJSON.h test.c
+	$(CC) $^ -o $@ $(LDLIBS) -I.

-install: $(DYLIBNAME) $(STLIBNAME)
-		mkdir -p $(INSTALL_LIBRARY_PATH) $(INSTALL_INCLUDE_PATH)
-		$(INSTALL) cJSON.h $(INSTALL_INCLUDE_PATH)
-		$(INSTALL) $(DYLIBNAME) $(INSTALL_LIBRARY_PATH)
-		$(INSTALL) $(STLIBNAME) $(INSTALL_LIBRARY_PATH)
+#static libraries
+#cJSON
+$(CJSON_STATIC): $(CJSON_OBJ)
+	$(AR) rcs $@ $<
+#cJSON_Utils
+$(UTILS_STATIC): $(UTILS_OBJ)
+	$(AR) rcs $@ $<

-uninstall:
-		rm -rf $(INSTALL_LIBRARY_PATH)/$(DYLIBNAME)
-		rm -rf $(INSTALL_LIBRARY_PATH)/$(STLIBNAME)
-		rm -rf $(INSTALL_INCLUDE_PATH)/cJSON.h
+#shared libraries .so.1.0.0
+#cJSON
+$(CJSON_SHARED_VERSION): $(CJSON_OBJ)
+	$(CC) -shared -o $@ $< $(LDFLAGS)
+#cJSON_Utils
+$(UTILS_SHARED_VERSION): $(UTILS_OBJ)
+	$(CC) -shared -o $@ $< $(LDFLAGS)

-clean: 
-		rm -rf $(DYLIBNAME) $(STLIBNAME) $(TESTS) *.o
+#objects
+#cJSON
+$(CJSON_OBJ): cJSON.c cJSON.h
+#cJSON_Utils
+$(UTILS_OBJ): cJSON_Utils.c cJSON_Utils.h
+
+
+#links .so -> .so.1 -> .so.1.0.0
+#cJSON
+$(CJSON_SHARED_SO): $(CJSON_SHARED_VERSION)
+	ln -s $(CJSON_SHARED_VERSION) $(CJSON_SHARED_SO)
+$(CJSON_SHARED): $(CJSON_SHARED_SO)
+	ln -s $(CJSON_SHARED_SO) $(CJSON_SHARED)
+#cJSON_Utils
+$(UTILS_SHARED_SO): $(UTILS_SHARED_VERSION)
+	ln -s $(UTILS_SHARED_VERSION) $(UTILS_SHARED_SO)
+$(UTILS_SHARED): $(UTILS_SHARED_SO)
+	ln -s $(UTILS_SHARED_SO) $(UTILS_SHARED)
+
+#install
+#cJSON
+install-cjson:
+	mkdir -p $(INSTALL_LIBRARY_PATH) $(INSTALL_INCLUDE_PATH)
+	$(INSTALL) cJSON.h $(INSTALL_INCLUDE_PATH)
+	$(INSTALL) $(CJSON_SHARED) $(CJSON_SHARED_SO) $(CJSON_SHARED_VERSION) $(INSTALL_LIBRARY_PATH)
+#cJSON_Utils
+install-utils: install-cjson
+	$(INSTALL) cJSON_Utils.h $(INSTALL_INCLUDE_PATH)
+	$(INSTALL) $(UTILS_SHARED) $(UTILS_SHARED_SO) $(UTILS_SHARED_VERSION) $(INSTALL_LIBRARY_PATH)
+
+install: install-cjson install-utils
+
+#uninstall
+#cJSON
+uninstall-cjson: uninstall-utils
+	$(RM) $(INSTALL_LIBRARY_PATH)/$(CJSON_SHARED)
+	$(RM) $(INSTALL_LIBRARY_PATH)/$(CJSON_SHARED_VERSION)
+	$(RM) $(INSTALL_LIBRARY_PATH)/$(CJSON_SHARED_SO)
+	rmdir $(INSTALL_LIBRARY_PATH)
+	$(RM) $(INSTALL_INCLUDE_PATH)/cJSON.h
+	rmdir $(INSTALL_INCLUDE_PATH)
+#cJSON_Utils
+uninstall-utils:
+	$(RM) $(INSTALL_LIBRARY_PATH)/$(UTILS_SHARED)
+	$(RM) $(INSTALL_LIBRARY_PATH)/$(UTILS_SHARED_VERSION)
+	$(RM) $(INSTALL_LIBRARY_PATH)/$(UTILS_SHARED_SO)
+	$(RM) $(INSTALL_INCLUDE_PATH)/cJSON_Utils.h
+
+uninstall: uninstall-utils uninstall-cjson
+
+clean:
+	$(RM) $(CJSON_OBJ) $(UTILS_OBJ) #delete object files
+	$(RM) $(CJSON_SHARED) $(CJSON_SHARED_VERSION) $(CJSON_SHARED_SO) $(CJSON_STATIC) #delete cJSON
+	$(RM) $(UTILS_SHARED) $(UTILS_SHARED_VERSION) $(UTILS_SHARED_SO) $(UTILS_STATIC) #delete cJSON_Utils
+	$(RM) $(CJSON_TEST) $(UTILS_TEST) #delete tests
--- a/README.md
+++ b/README.md
@@ -1,27 +1,41 @@
+# cJSON

-  Copyright (c) 2009 Dave Gamble
+Ultralightweight JSON parser in ANSI C.

-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
+## Table of contents
+* [License](#license)
+* [Usage](#usage)
+  * [Welcome to cJSON](#welcome-to-cjson)
+  * [Building](#building)
+  * [Some JSON](#some-json)
+  * [Here's the structure](#heres-the-structure)
+  * [Enjoy cJSON!](#enjoy-cjson)

-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
+## License

-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
+>  Copyright (c) 2009-2016 Dave Gamble
+>
+>  Permission is hereby granted, free of charge, to any person obtaining a copy
+>  of this software and associated documentation files (the "Software"), to deal
+>  in the Software without restriction, including without limitation the rights
+>  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+>  copies of the Software, and to permit persons to whom the Software is
+>  furnished to do so, subject to the following conditions:
+>
+>  The above copyright notice and this permission notice shall be included in
+>  all copies or substantial portions of the Software.
+>
+>  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+>  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+>  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+>  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+>  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+>  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+>  THE SOFTWARE.

+## Usage

-Welcome to cJSON.
-----------------
+### Welcome to cJSON.

 cJSON aims to be the dumbest possible parser that you can get your job done with.
 It's a single file of C, and a single header file.
@@ -30,13 +44,6 @@ JSON is described best here: http://www.json.org/
 It's like XML, but fat-free. You use it to move data around, store things, or just
 generally represent your program's state.

-First up, how do I build?
-Add cJSON.c to your project, and put cJSON.h somewhere in the header search path.
-For example, to build the test app:
-
-    gcc cJSON.c test.c -o test -lm
-    ./test
-
 As a library, cJSON exists to take away as much legwork as it can, but not get in your way.
 As a point of pragmatism (i.e. ignoring the truth), I'm going to say that you can use it
 in one of two modes: Auto and Manual. Let's have a quick run-through.
@@ -45,167 +52,270 @@ I lifted some JSON from this page: http://www.json.org/fatfree.html
 That page inspired me to write cJSON, which is a parser that tries to share the same
 philosophy as JSON itself. Simple, dumb, out of the way.

-Some JSON:
----------
+### Building

-    {
-        "name": "Jack (\"Bee\") Nimble", 
-        "format": {
-            "type":       "rect", 
-            "width":      1920, 
-            "height":     1080, 
-            "interlace":  false, 
-            "frame rate": 24
-        }
+There are several ways to incorporate cJSON into your project.
+
+#### copying the source
+Because the entire library is only one C file and one header file, you can just copy `cJSON.h` and `cJSON.c` to your projects source and start using it.
+
+cJSON is written in ANSI C (C89) in order to support as many platforms and compilers as possible.
+
+#### CMake
+With CMake, cJSON supports a full blown build system. This way you get the most features. With CMake it is recommended to do an out of tree build, meaning the compiled files are put in a directory separate from the source files. So in order to build cJSON with CMake on a Unix platform, make a `build` directory and run CMake inside it.
+
+```
+mkdir build
+cd build
+cmake ..
+```
+
+This will create a Makefile and a bunch of other files. You can then compile it:
+
+```
+make
+```
+
+And install it with `make install` if you want. By default it installs the headers `/usr/local/include/cjson` and the libraries to `/usr/local/lib`. It also installs files for pkg-config to make it easier to detect and use an existing installation of CMake. And it installs CMake config files, that can be used by other CMake based projects to discover the library.
+
+You can change the build process with a list of different options that you can pass to CMake. Turn them on with `On` and off with `Off`:
+* `-DENABLE_CJSON_TESTS=On`: Enable building the tests. (on by default)
+* `-DENABLE_CJSON_UTILS=On`: Enable building cJSON_Utils. (off by default)
+* `-DENABLE_TARGET_EXPORT=On`: Enable the export of CMake targets. Turn off if it makes problems. (on by default)
+* `-DENABLE_CUSTOM_COMPILER_FLAGS=On`: Enable custom compiler flags (currently for Clang and GCC). Turn off if it makes problems. (on by default)
+* `-DBUILD_SHARED_LIBS=On`: Build the shared libraries. (on by default)
+* `-DCMAKE_INSTALL_PREFIX=/usr`: Set a prefix for the installation.
+
+If you are packaging cJSON for a distribution of Linux, you would probably take these steps for example:
+```
+mkdir build
+cd build
+cmake .. -DENABLE_CJSON_UTILS=On -DENABLE_CJSON_TESTS=Off -DCMAKE_INSTALL_PREFIX=/usr
+make
+make DESTDIR=$pkgdir install
+```
+
+CMake supports a lot of different platforms, not only UNIX Makefiles, but only UNIX Makefiles have been tested. It works on GNU/Linux and has been confirmed to compile on some versions of macOS, Cygwin, FreeBSD, Solaris and OpenIndiana.
+
+#### Makefile
+If you don't have CMake available, but still have make. You can use the makefile to build cJSON:
+
+Run this command in the directory with the source code and it will automatically compile static and shared libraries and a little test program.
+
+```
+make all
+```
+
+If you want, you can install the compiled library to your system using `make install`. By default it will install the headers in `/usr/local/include/cjson` and the libraries in `/usr/local/lib`. But you can change this behavior by setting the `PREFIX` and `DESTDIR` variables: `make PREFIX=/usr DESTDIR=temp install`.
+
+### Some JSON:
+
+```json
+{
+    "name": "Jack (\"Bee\") Nimble",
+    "format": {
+        "type":       "rect",
+        "width":      1920,
+        "height":     1080,
+        "interlace":  false,
+        "frame rate": 24
    }
+}
+```

 Assume that you got this from a file, a webserver, or magic JSON elves, whatever,
-you have a char * to it. Everything is a cJSON struct.
+you have a `char *` to it. Everything is a `cJSON` struct.
 Get it parsed:

-    cJSON * root = cJSON_Parse(my_json_string);
+```c
+cJSON * root = cJSON_Parse(my_json_string);
+```

 This is an object. We're in C. We don't have objects. But we do have structs.
 What's the framerate?

-    cJSON * format = cJSON_GetObjectItem(root,"format");
-    int framerate = cJSON_GetObjectItem(format,"frame rate")->valueint;
+```c
+cJSON *format = cJSON_GetObjectItem(root, "format");
+int framerate = cJSON_GetObjectItem(format, "frame rate")->valueint;
+```

 Want to change the framerate?

-    cJSON_GetObjectItem(format,"frame rate")->valueint = 25;
+```c
+cJSON_GetObjectItem(format, "frame rate")->valueint = 25;
+```

 Back to disk?

-    char * rendered = cJSON_Print(root);
+```c
+char *rendered = cJSON_Print(root);
+```

 Finished? Delete the root (this takes care of everything else).

-    cJSON_Delete(root);
+```c
+cJSON_Delete(root);
+```

 That's AUTO mode. If you're going to use Auto mode, you really ought to check pointers
 before you dereference them. If you want to see how you'd build this struct in code?

-    cJSON *root,*fmt;
-    root = cJSON_CreateObject();  
-    cJSON_AddItemToObject(root, "name", cJSON_CreateString("Jack (\"Bee\") Nimble"));
-    cJSON_AddItemToObject(root, "format", fmt = cJSON_CreateObject());
-    cJSON_AddStringToObject(fmt, "type", "rect");
-    cJSON_AddNumberToObject(fmt, "width", 1920);
-    cJSON_AddNumberToObject(fmt, "height", 1080);
-    cJSON_AddFalseToObject (fmt, "interlace");
-    cJSON_AddNumberToObject(fmt, "frame rate", 24);
+```c
+cJSON *root;
+cJSON *fmt;
+root = cJSON_CreateObject();
+cJSON_AddItemToObject(root, "name", cJSON_CreateString("Jack (\"Bee\") Nimble"));
+cJSON_AddItemToObject(root, "format", fmt = cJSON_CreateObject());
+cJSON_AddStringToObject(fmt, "type", "rect");
+cJSON_AddNumberToObject(fmt, "width", 1920);
+cJSON_AddNumberToObject(fmt, "height", 1080);
+cJSON_AddFalseToObject (fmt, "interlace");
+cJSON_AddNumberToObject(fmt, "frame rate", 24);
+```

 Hopefully we can agree that's not a lot of code? There's no overhead, no unnecessary setup.
-Look at test.c for a bunch of nice examples, mostly all ripped off the json.org site, and
+Look at `test.c` for a bunch of nice examples, mostly all ripped off the [json.org](http://json.org) site, and
 a few from elsewhere.

 What about manual mode? First up you need some detail.
-Let's cover how the cJSON objects represent the JSON data.
+Let's cover how the `cJSON` objects represent the JSON data.
 cJSON doesn't distinguish arrays from objects in handling; just type.
-Each cJSON has, potentially, a child, siblings, value, a name.
+Each `cJSON` has, potentially, a child, siblings, value, a name.

-The root object has: Object Type and a Child
-The Child has name "name", with value "Jack ("Bee") Nimble", and a sibling:
-Sibling has type Object, name "format", and a child.
-That child has type String, name "type", value "rect", and a sibling:
-Sibling has type Number, name "width", value 1920, and a sibling:
-Sibling has type Number, name "height", value 1080, and a sibling:
-Sibling has type False, name "interlace", and a sibling:
-Sibling has type Number, name "frame rate", value 24
+* The `root` object has: *Object* Type and a Child
+* The Child has name "name", with value "Jack ("Bee") Nimble", and a sibling:
+* Sibling has type *Object*, name "format", and a child.
+* That child has type *String*, name "type", value "rect", and a sibling:
+* Sibling has type *Number*, name "width", value 1920, and a sibling:
+* Sibling has type *Number*, name "height", value 1080, and a sibling:
+* Sibling has type *False*, name "interlace", and a sibling:
+* Sibling has type *Number*, name "frame rate", value 24

-Here's the structure:
---------------------
+### Here's the structure:

-    typedef struct cJSON {
-      struct cJSON *next,*prev;
-      struct cJSON *child;
+```c
+typedef struct cJSON {
+    struct cJSON *next,*prev;
+    struct cJSON *child;

-      int type;
+    int type;

-      char *valuestring;
-      int valueint;
-      double valuedouble;
+    char *valuestring;
+    int valueint;
+    double valuedouble;

-      char *string;
-    } cJSON;
+    char *string;
+} cJSON;
+```

 By default all values are 0 unless set by virtue of being meaningful.

-next/prev is a doubly linked list of siblings. next takes you to your sibling,
-prev takes you back from your sibling to you.
-Only objects and arrays have a "child", and it's the head of the doubly linked list.
-A "child" entry will have prev==0, but next potentially points on. The last sibling has next=0.
-The type expresses Null/True/False/Number/String/Array/Object, all of which are #defined in
-cJSON.h
+`next`/`prev` is a doubly linked list of siblings. `next` takes you to your sibling,
+`prev` takes you back from your sibling to you.
+Only objects and arrays have a `child`, and it's the head of the doubly linked list.
+A `child` entry will have `prev == 0`, but next potentially points on. The last sibling has `next == 0`.
+The type expresses *Null*/*True*/*False*/*Number*/*String*/*Array*/*Object*, all of which are `#defined` in
+`cJSON.h`.

-A Number has valueint and valuedouble. If you're expecting an int, read valueint, if not read
-valuedouble.
+A *Number* has `valueint` and `valuedouble`. If you're expecting an `int`, read `valueint`, if not read
+`valuedouble`.

-Any entry which is in the linked list which is the child of an object will have a "string"
-which is the "name" of the entry. When I said "name" in the above example, that's "string".
-"string" is the JSON name for the 'variable name' if you will.
+Any entry which is in the linked list which is the child of an object will have a `string`
+which is the "name" of the entry. When I said "name" in the above example, that's `string`.
+`string` is the JSON name for the 'variable name' if you will.

 Now you can trivially walk the lists, recursively, and parse as you please.
-You can invoke cJSON_Parse to get cJSON to parse for you, and then you can take
+You can invoke `cJSON_Parse` to get cJSON to parse for you, and then you can take
 the root object, and traverse the structure (which is, formally, an N-tree),
 and tokenise as you please. If you wanted to build a callback style parser, this is how
 you'd do it (just an example, since these things are very specific):

-    void parse_and_callback(cJSON *item,const char *prefix)
+```c
+void parse_and_callback(cJSON *item, const char *prefix)
+{
+    while (item)
    {
-      while (item)
-      {
        char *newprefix = malloc(strlen(prefix) + strlen(item->name) + 2);
-        sprintf(newprefix,"%s/%s",prefix,item->name);
+        sprintf(newprefix, "%s/%s", prefix, item->name);
        int dorecurse = callback(newprefix, item->type, item);
-        if (item->child && dorecurse) parse_and_callback(item->child, newprefix);
+        if (item->child && dorecurse)
+        {
+            parse_and_callback(item->child, newprefix);
+        }
        item = item->next;
        free(newprefix);
-      }
    }
+}
+```

-The prefix process will build you a separated list, to simplify your callback handling.
-The 'dorecurse' flag would let the callback decide to handle sub-arrays on it's own, or
+The `prefix` process will build you a separated list, to simplify your callback handling.
+The `dorecurse` flag would let the callback decide to handle sub-arrays on it's own, or
 let you invoke it per-item. For the item above, your callback might look like this:

-    int callback(const char *name,int type,cJSON *item)
+```c
+int callback(const char *name, int type, cJSON *item)
+{
+    if (!strcmp(name, "name"))
    {
-      if (!strcmp(name,"name"))  { /* populate name */ }
-      else if (!strcmp(name,"format/type")  { /* handle "rect" */ }
-      else if (!strcmp(name,"format/width")  { /* 800 */ }
-      else if (!strcmp(name,"format/height")  { /* 600 */ }
-      else if (!strcmp(name,"format/interlace")  { /* false */ }
-      else if (!strcmp(name,"format/frame rate")  { /* 24 */ }
-      return 1;
+        /* populate name */
    }
+    else if (!strcmp(name, "format/type")
+    {
+        /* handle "rect" */ }
+    else if (!strcmp(name, "format/width")
+    {
+        /* 800 */
+    }
+    else if (!strcmp(name, "format/height")
+    {
+        /* 600 */
+    }
+    else if (!strcmp(name, "format/interlace")
+    {
+        /* false */
+    }
+    else if (!strcmp(name, "format/frame rate")
+    {
+        /* 24 */
+    }
+
+    return 1;
+}
+```

 Alternatively, you might like to parse iteratively.
 You'd use:

-    void parse_object(cJSON *item)
+```c
+void parse_object(cJSON *item)
+{
+    int i;
+    for (i = 0; i < cJSON_GetArraySize(item); i++)
    {
-      int i;
-      for (i = 0 ; i < cJSON_GetArraySize(item) ; i++)
-      {
-        cJSON * subitem = cJSON_GetArrayItem(item, i);
-        // handle subitem.  
-      }
+        cJSON *subitem = cJSON_GetArrayItem(item, i);
+        // handle subitem
    }
+}
+```

 Or, for PROPER manual mode:

-    void parse_object(cJSON * item)
+```c
+void parse_object(cJSON *item)
+{
+    cJSON *subitem = item->child;
+    while (subitem)
    {
-      cJSON *subitem = item->child;
-      while (subitem)
-      {
        // handle subitem
-        if (subitem->child) parse_object(subitem->child);
-    
+        if (subitem->child)
+        {
+            parse_object(subitem->child);
+        }
+
        subitem = subitem->next;
-      }
    }
+}
+```

 Of course, this should look familiar, since this is just a stripped-down version
 of the callback-parser.
@@ -218,34 +328,45 @@ You can, of course, hand your sub-objects to other functions to populate.
 Also, if you find a use for it, you can manually build the objects.
 For instance, suppose you wanted to build an array of objects?

-    cJSON * objects[24];
+```c
+cJSON *objects[24];

-    cJSON * Create_array_of_anything(cJSON ** items, int num)
+cJSON *Create_array_of_anything(cJSON **items, int num)
+{
+    int i;
+    cJSON *prev;
+    cJSON *root = cJSON_CreateArray();
+    for (i = 0; i < 24; i++)
    {
-      int i;
-      cJSON * prev, * root = cJSON_CreateArray();
-      for (i = 0 ; i < 24 ; i++)
-      {
-        if (!i) root->child = objects[i];
-        else prev->next = objects[i], objects[i]->prev = prev;
+        if (!i)
+        {
+            root->child = objects[i];
+        }
+        else
+        {
+            prev->next = objects[i];
+            objects[i]->prev = prev;
+        }
+
        prev = objects[i];
-      }
-      return root;
    }
-  
-and simply: Create_array_of_anything(objects, 24);
+
+    return root;
+}
+```
+
+and simply: `Create_array_of_anything(objects, 24);`

 cJSON doesn't make any assumptions about what order you create things in.
 You can attach the objects, as above, and later add children to each
 of those objects.

-As soon as you call cJSON_Print, it renders the structure to text.
+As soon as you call `cJSON_Print`, it renders the structure to text.

-The test.c code shows how to handle a bunch of typical cases. If you uncomment
-the code, it'll load, parse and print a bunch of test files, also from json.org,
-which are more complex than I'd care to try and stash into a const char array[].
+The `test.c` code shows how to handle a bunch of typical cases. If you uncomment
+the code, it'll load, parse and print a bunch of test files, also from [json.org](http://json.org),
+which are more complex than I'd care to try and stash into a `const char array[]`.

-Enjoy cJSON!
-----------------------
+# Enjoy cJSON!

 - Dave Gamble, Aug 2009
--- a/cJSON.c
+++ b/cJSON.c
@@ -46,7 +46,12 @@
    #error "Failed to determine the size of an integer"
 #endif

-static const char *global_ep;
+/* define our own boolean type */
+typedef int cjbool;
+#define true ((cjbool)1)
+#define false ((cjbool)0)
+
+static const char *global_ep = NULL;

 const char *cJSON_GetErrorPtr(void)
 {
@@ -66,7 +71,7 @@ static int cJSON_strcasecmp(const char *s1, const char *s2)
    }
    for(; tolower(*(const unsigned char *)s1) == tolower(*(const unsigned char *)s2); ++s1, ++s2)
    {
-        if (*s1 == 0)
+        if (*s1 == '\0')
        {
            return 0;
        }
@@ -80,13 +85,13 @@ static void (*cJSON_free)(void *ptr) = free;

 static char* cJSON_strdup(const char* str)
 {
-    size_t len;
-    char* copy;
+    size_t len = 0;
+    char *copy = NULL;

    len = strlen(str) + 1;
    if (!(copy = (char*)cJSON_malloc(len)))
    {
-        return 0;
+        return NULL;
    }
    memcpy(copy, str, len);

@@ -113,7 +118,7 @@ static cJSON *cJSON_New_Item(void)
    cJSON* node = (cJSON*)cJSON_malloc(sizeof(cJSON));
    if (node)
    {
-        memset(node, 0, sizeof(cJSON));
+        memset(node, '\0', sizeof(cJSON));
    }

    return node;
@@ -122,7 +127,7 @@ static cJSON *cJSON_New_Item(void)
 /* Delete a cJSON structure. */
 void cJSON_Delete(cJSON *c)
 {
-    cJSON *next;
+    cJSON *next = NULL;
    while (c)
    {
        next = c->next;
@@ -244,11 +249,11 @@ typedef struct
 /* realloc printbuffer if necessary to have at least "needed" bytes more */
 static char* ensure(printbuffer *p, int needed)
 {
-    char *newbuffer;
-    int newsize;
+    char *newbuffer = NULL;
+    int newsize = 0;
    if (!p || !p->buffer)
    {
-        return 0;
+        return NULL;
    }
    needed += p->offset;
    if (needed <= p->length)
@@ -262,9 +267,9 @@ static char* ensure(printbuffer *p, int needed)
    {
        cJSON_free(p->buffer);
        p->length = 0;
-        p->buffer = 0;
+        p->buffer = NULL;

-        return 0;
+        return NULL;
    }
    if (newbuffer)
    {
@@ -280,7 +285,7 @@ static char* ensure(printbuffer *p, int needed)
 /* calculate the new length of the string in a printbuffer */
 static int update(const printbuffer *p)
 {
-    char *str;
+    char *str = NULL;
    if (!p || !p->buffer)
    {
        return 0;
@@ -293,7 +298,7 @@ static int update(const printbuffer *p)
 /* Render the number nicely from the given item into a string. */
 static char *print_number(const cJSON *item, printbuffer *p)
 {
-    char *str = 0;
+    char *str = NULL;
    double d = item->valuedouble;
    /* special case for 0. */
    if (d == 0)
@@ -468,17 +473,17 @@ static const char *parse_string(cJSON *item, const char *str, const char **ep)
 {
    const char *ptr = str + 1;
    const char *end_ptr =str + 1;
-    char *ptr2;
-    char *out;
+    char *ptr2 = NULL;
+    char *out = NULL;
    int len = 0;
-    unsigned uc;
-    unsigned uc2;
+    unsigned uc = 0;
+    unsigned uc2 = 0;

    /* not a string! */
    if (*str != '\"')
    {
        *ep = str;
-        return 0;
+        return NULL;
    }

    while ((*end_ptr != '\"') && *end_ptr && ++len)
@@ -488,7 +493,7 @@ static const char *parse_string(cJSON *item, const char *str, const char **ep)
            if (*end_ptr == '\0')
            {
                /* prevent buffer overflow when last input character is a backslash */
-                return 0;
+                return NULL;
            }
            /* Skip escaped quotes. */
            end_ptr++;
@@ -499,7 +504,7 @@ static const char *parse_string(cJSON *item, const char *str, const char **ep)
    out = (char*)cJSON_malloc(len + 1);
    if (!out)
    {
-        return 0;
+        return NULL;
    }
    item->valuestring = out; /* assign here so out will be deleted during cJSON_Delete() later */
    item->type = cJSON_String;
@@ -534,6 +539,11 @@ static const char *parse_string(cJSON *item, const char *str, const char **ep)
                case 't':
                    *ptr2++ = '\t';
                    break;
+                case '\"':
+                case '\\':
+                case '/':
+                    *ptr2++ = *ptr;
+                    break;
                case 'u':
                    /* transcode utf16 to utf8. See RFC2781 and RFC3629. */
                    uc = parse_hex4(ptr + 1); /* get the unicode char. */
@@ -542,13 +552,13 @@ static const char *parse_string(cJSON *item, const char *str, const char **ep)
                    {
                        /* invalid */
                        *ep = str;
-                        return 0;
+                        return NULL;
                    }
                    /* check for invalid. */
                    if (((uc >= 0xDC00) && (uc <= 0xDFFF)) || (uc == 0))
                    {
                        *ep = str;
-                        return 0;
+                        return NULL;
                    }

                    /* UTF16 surrogate pairs. */
@@ -558,13 +568,13 @@ static const char *parse_string(cJSON *item, const char *str, const char **ep)
                        {
                            /* invalid */
                            *ep = str;
-                            return 0;
+                            return NULL;
                        }
                        if ((ptr[1] != '\\') || (ptr[2] != 'u'))
                        {
                            /* missing second-half of surrogate. */
                            *ep = str;
-                            return 0;
+                            return NULL;
                        }
                        uc2 = parse_hex4(ptr + 3);
                        ptr += 6; /* \uXXXX */
@@ -572,7 +582,7 @@ static const char *parse_string(cJSON *item, const char *str, const char **ep)
                        {
                            /* invalid second-half of surrogate. */
                            *ep = str;
-                            return 0;
+                            return NULL;
                        }
                        /* calculate unicode codepoint from the surrogate pair */
                        uc = 0x10000 + (((uc & 0x3FF) << 10) | (uc2 & 0x3FF));
@@ -620,8 +630,8 @@ static const char *parse_string(cJSON *item, const char *str, const char **ep)
                    ptr2 += len;
                    break;
                default:
-                    *ptr2++ = *ptr;
-                    break;
+                    *ep = str;
+                    return NULL;
            }
            ptr++;
        }
@@ -638,12 +648,12 @@ static const char *parse_string(cJSON *item, const char *str, const char **ep)
 /* Render the cstring provided to an escaped version that can be printed. */
 static char *print_string_ptr(const char *str, printbuffer *p)
 {
-    const char *ptr;
-    char *ptr2;
-    char *out;
+    const char *ptr = NULL;
+    char *ptr2 = NULL;
+    char *out = NULL;
    int len = 0;
-    int flag = 0;
-    unsigned char token;
+    cjbool flag = false;
+    unsigned char token = '\0';

    /* empty string */
    if (!str)
@@ -658,7 +668,7 @@ static char *print_string_ptr(const char *str, printbuffer *p)
        }
        if (!out)
        {
-            return 0;
+            return NULL;
        }
        strcpy(out, "\"\"");

@@ -688,7 +698,7 @@ static char *print_string_ptr(const char *str, printbuffer *p)
        }
        if (!out)
        {
-            return 0;
+            return NULL;
        }

        ptr2 = out;
@@ -725,7 +735,7 @@ static char *print_string_ptr(const char *str, printbuffer *p)
    }
    if (!out)
    {
-        return 0;
+        return NULL;
    }

    ptr2 = out;
@@ -788,11 +798,11 @@ static char *print_string(const cJSON *item, printbuffer *p)

 /* Predeclare these prototypes. */
 static const char *parse_value(cJSON *item, const char *value, const char **ep);
-static char *print_value(const cJSON *item, int depth, int fmt, printbuffer *p);
+static char *print_value(const cJSON *item, int depth, cjbool fmt, printbuffer *p);
 static const char *parse_array(cJSON *item, const char *value, const char **ep);
-static char *print_array(const cJSON *item, int depth, int fmt, printbuffer *p);
+static char *print_array(const cJSON *item, int depth, cjbool fmt, printbuffer *p);
 static const char *parse_object(cJSON *item, const char *value, const char **ep);
-static char *print_object(const cJSON *item, int depth, int fmt, printbuffer *p);
+static char *print_object(const cJSON *item, int depth, cjbool fmt, printbuffer *p);

 /* Utility to jump whitespace and cr/lf */
 static const char *skip(const char *in)
@@ -806,16 +816,16 @@ static const char *skip(const char *in)
 }

 /* Parse an object - create a new root, and populate. */
-cJSON *cJSON_ParseWithOpts(const char *value, const char **return_parse_end, int require_null_terminated)
+cJSON *cJSON_ParseWithOpts(const char *value, const char **return_parse_end, cjbool require_null_terminated)
 {
-    const char *end = 0;
+    const char *end = NULL;
    /* use global error pointer if no specific one was given */
    const char **ep = return_parse_end ? return_parse_end : &global_ep;
    cJSON *c = cJSON_New_Item();
-    *ep = 0;
+    *ep = NULL;
    if (!c) /* memory fail */
    {
-        return 0;
+        return NULL;
    }

    end = parse_value(c, skip(value), ep);
@@ -823,7 +833,7 @@ cJSON *cJSON_ParseWithOpts(const char *value, const char **return_parse_end, int
    {
        /* parse failure. ep is set. */
        cJSON_Delete(c);
-        return 0;
+        return NULL;
    }

    /* if we require null-terminated JSON without appended garbage, skip and then check for a null terminator */
@@ -834,7 +844,7 @@ cJSON *cJSON_ParseWithOpts(const char *value, const char **return_parse_end, int
        {
            cJSON_Delete(c);
            *ep = end;
-            return 0;
+            return NULL;
        }
    }
    if (return_parse_end)
@@ -862,13 +872,13 @@ char *cJSON_PrintUnformatted(const cJSON *item)
    return print_value(item, 0, 0, 0);
 }

-char *cJSON_PrintBuffered(const cJSON *item, int prebuffer, int fmt)
+char *cJSON_PrintBuffered(const cJSON *item, int prebuffer, cjbool fmt)
 {
    printbuffer p;
    p.buffer = (char*)cJSON_malloc(prebuffer);
    if (!p.buffer)
    {
-        return 0;
+        return NULL;
    }
    p.length = prebuffer;
    p.offset = 0;
@@ -883,7 +893,7 @@ static const char *parse_value(cJSON *item, const char *value, const char **ep)
    if (!value)
    {
        /* Fail on null. */
-        return 0;
+        return NULL;
    }

    /* parse the different types of values */
@@ -920,17 +930,19 @@ static const char *parse_value(cJSON *item, const char *value, const char **ep)
        return parse_object(item, value, ep);
    }

-    *ep=value;return 0;	/* failure. */
+    /* failure. */
+    *ep = value;
+    return NULL;
 }

 /* Render a value to text. */
-static char *print_value(const cJSON *item, int depth, int fmt, printbuffer *p)
+static char *print_value(const cJSON *item, int depth, cjbool fmt, printbuffer *p)
 {
-    char *out = 0;
+    char *out = NULL;

    if (!item)
    {
-        return 0;
+        return NULL;
    }
    if (p)
    {
@@ -1005,12 +1017,12 @@ static char *print_value(const cJSON *item, int depth, int fmt, printbuffer *p)
 /* Build an array from input text. */
 static const char *parse_array(cJSON *item,const char *value,const char **ep)
 {
-    cJSON *child;
+    cJSON *child = NULL;
    if (*value != '[')
    {
        /* not an array! */
        *ep = value;
-        return 0;
+        return NULL;
    }

    item->type = cJSON_Array;
@@ -1025,23 +1037,23 @@ static const char *parse_array(cJSON *item,const char *value,const char **ep)
    if (!item->child)
    {
        /* memory fail */
-        return 0;
+        return NULL;
    }
    /* skip any spacing, get the value. */
    value = skip(parse_value(child, skip(value), ep));
    if (!value)
    {
-        return 0;
+        return NULL;
    }

    /* loop through the comma separated array elements */
    while (*value == ',')
    {
-        cJSON *new_item;
+        cJSON *new_item = NULL;
        if (!(new_item = cJSON_New_Item()))
        {
            /* memory fail */
-            return 0;
+            return NULL;
        }
        /* add new item to end of the linked list */
        child->next = new_item;
@@ -1053,7 +1065,7 @@ static const char *parse_array(cJSON *item,const char *value,const char **ep)
        if (!value)
        {
            /* memory fail */
-            return 0;
+            return NULL;
        }
    }

@@ -1066,21 +1078,21 @@ static const char *parse_array(cJSON *item,const char *value,const char **ep)
    /* malformed. */
    *ep = value;

-    return 0;
+    return NULL;
 }

 /* Render an array to text */
-static char *print_array(const cJSON *item, int depth, int fmt, printbuffer *p)
+static char *print_array(const cJSON *item, int depth, cjbool fmt, printbuffer *p)
 {
    char **entries;
-    char *out = 0;
-    char *ptr;
-    char *ret;
+    char *out = NULL;
+    char *ptr = NULL;
+    char *ret = NULL;
    int len = 5;
    cJSON *child = item->child;
    int numentries = 0;
    int i = 0;
-    int fail = 0;
+    cjbool fail = false;
    size_t tmplen = 0;

    /* How many entries in the array? */
@@ -1117,7 +1129,7 @@ static char *print_array(const cJSON *item, int depth, int fmt, printbuffer *p)
        ptr = ensure(p, 1);
        if (!ptr)
        {
-            return 0;
+            return NULL;
        }
        *ptr = '[';
        p->offset++;
@@ -1133,14 +1145,14 @@ static char *print_array(const cJSON *item, int depth, int fmt, printbuffer *p)
                ptr = ensure(p, len + 1);
                if (!ptr)
                {
-                    return 0;
+                    return NULL;
                }
                *ptr++ = ',';
                if(fmt)
                {
                    *ptr++ = ' ';
                }
-                *ptr = 0;
+                *ptr = '\0';
                p->offset += len;
            }
            child = child->next;
@@ -1148,7 +1160,7 @@ static char *print_array(const cJSON *item, int depth, int fmt, printbuffer *p)
        ptr = ensure(p, 2);
        if (!ptr)
        {
-            return 0;
+            return NULL;
        }
        *ptr++ = ']';
        *ptr = '\0';
@@ -1160,9 +1172,9 @@ static char *print_array(const cJSON *item, int depth, int fmt, printbuffer *p)
        entries = (char**)cJSON_malloc(numentries * sizeof(char*));
        if (!entries)
        {
-            return 0;
+            return NULL;
        }
-        memset(entries, 0, numentries * sizeof(char*));
+        memset(entries, '\0', numentries * sizeof(char*));

        /* Retrieve all the results: */
        child = item->child;
@@ -1176,7 +1188,7 @@ static char *print_array(const cJSON *item, int depth, int fmt, printbuffer *p)
            }
            else
            {
-                fail = 1;
+                fail = true;
            }
            child = child->next;
        }
@@ -1189,7 +1201,7 @@ static char *print_array(const cJSON *item, int depth, int fmt, printbuffer *p)
        /* If that fails, we fail. */
        if (!out)
        {
-            fail = 1;
+            fail = true;
        }

        /* Handle failure. */
@@ -1204,7 +1216,7 @@ static char *print_array(const cJSON *item, int depth, int fmt, printbuffer *p)
                }
            }
            cJSON_free(entries);
-            return 0;
+            return NULL;
        }

        /* Compose the output array. */
@@ -1223,7 +1235,7 @@ static char *print_array(const cJSON *item, int depth, int fmt, printbuffer *p)
                {
                    *ptr++ = ' ';
                }
-                *ptr = 0;
+                *ptr = '\0';
            }
            cJSON_free(entries[i]);
        }
@@ -1238,12 +1250,12 @@ static char *print_array(const cJSON *item, int depth, int fmt, printbuffer *p)
 /* Build an object from the text. */
 static const char *parse_object(cJSON *item, const char *value, const char **ep)
 {
-    cJSON *child;
+    cJSON *child = NULL;
    if (*value != '{')
    {
        /* not an object! */
        *ep = value;
-        return 0;
+        return NULL;
    }

    item->type = cJSON_Object;
@@ -1258,38 +1270,38 @@ static const char *parse_object(cJSON *item, const char *value, const char **ep)
    item->child = child;
    if (!item->child)
    {
-        return 0;
+        return NULL;
    }
    /* parse first key */
    value = skip(parse_string(child, skip(value), ep));
    if (!value)
    {
-        return 0;
+        return NULL;
    }
    /* use string as key, not value */
    child->string = child->valuestring;
-    child->valuestring = 0;
+    child->valuestring = NULL;

    if (*value != ':')
    {
        /* invalid object. */
        *ep = value;
-        return 0;
+        return NULL;
    }
    /* skip any spacing, get the value. */
    value = skip(parse_value(child, skip(value + 1), ep));
    if (!value)
    {
-        return 0;
+        return NULL;
    }

    while (*value == ',')
    {
-        cJSON *new_item;
+        cJSON *new_item = NULL;
        if (!(new_item = cJSON_New_Item()))
        {
            /* memory fail */
-            return 0;
+            return NULL;
        }
        /* add to linked list */
        child->next = new_item;
@@ -1299,24 +1311,24 @@ static const char *parse_object(cJSON *item, const char *value, const char **ep)
        value = skip(parse_string(child, skip(value + 1), ep));
        if (!value)
        {
-            return 0;
+            return NULL;
        }

        /* use string as key, not value */
        child->string = child->valuestring;
-        child->valuestring = 0;
+        child->valuestring = NULL;

        if (*value != ':')
        {
            /* invalid object. */
            *ep = value;
-            return 0;
+            return NULL;
        }
        /* skip any spacing, get the value. */
        value = skip(parse_value(child, skip(value + 1), ep));
        if (!value)
        {
-            return 0;
+            return NULL;
        }
    }
    /* end of object */
@@ -1327,24 +1339,24 @@ static const char *parse_object(cJSON *item, const char *value, const char **ep)

    /* malformed */
    *ep = value;
-    return 0;
+    return NULL;
 }

 /* Render an object to text. */
-static char *print_object(const cJSON *item, int depth, int fmt, printbuffer *p)
+static char *print_object(const cJSON *item, int depth, cjbool fmt, printbuffer *p)
 {
-    char **entries = 0;
-    char **names = 0;
-    char *out = 0;
-    char *ptr;
-    char *ret;
-    char *str;
+    char **entries = NULL;
+    char **names = NULL;
+    char *out = NULL;
+    char *ptr = NULL;
+    char *ret = NULL;
+    char *str = NULL;
    int len = 7;
    int i = 0;
-    int j;
+    int j = 0;
    cJSON *child = item->child;
    int numentries = 0;
-    int fail = 0;
+    cjbool fail = false;
    size_t tmplen = 0;

    /* Count the number of entries. */
@@ -1367,7 +1379,7 @@ static char *print_object(const cJSON *item, int depth, int fmt, printbuffer *p)
        }
        if (!out)
        {
-            return 0;
+            return NULL;
        }
        ptr = out;
        *ptr++ = '{';
@@ -1392,7 +1404,7 @@ static char *print_object(const cJSON *item, int depth, int fmt, printbuffer *p)
        ptr = ensure(p, len + 1);
        if (!ptr)
        {
-            return 0;
+            return NULL;
        }

        *ptr++ = '{';
@@ -1412,7 +1424,7 @@ static char *print_object(const cJSON *item, int depth, int fmt, printbuffer *p)
                ptr = ensure(p, depth);
                if (!ptr)
                {
-                    return 0;
+                    return NULL;
                }
                for (j = 0; j < depth; j++)
                {
@@ -1429,7 +1441,7 @@ static char *print_object(const cJSON *item, int depth, int fmt, printbuffer *p)
            ptr = ensure(p, len);
            if (!ptr)
            {
-                return 0;
+                return NULL;
            }
            *ptr++ = ':';
            if (fmt)
@@ -1447,7 +1459,7 @@ static char *print_object(const cJSON *item, int depth, int fmt, printbuffer *p)
            ptr = ensure(p, len + 1);
            if (!ptr)
            {
-                return 0;
+                return NULL;
            }
            if (child->next)
            {
@@ -1467,7 +1479,7 @@ static char *print_object(const cJSON *item, int depth, int fmt, printbuffer *p)
        ptr = ensure(p, fmt ? (depth + 1) : 2);
        if (!ptr)
        {
-            return 0;
+            return NULL;
        }
        if (fmt)
        {
@@ -1486,16 +1498,16 @@ static char *print_object(const cJSON *item, int depth, int fmt, printbuffer *p)
        entries = (char**)cJSON_malloc(numentries * sizeof(char*));
        if (!entries)
        {
-            return 0;
+            return NULL;
        }
        names = (char**)cJSON_malloc(numentries * sizeof(char*));
        if (!names)
        {
            cJSON_free(entries);
-            return 0;
+            return NULL;
        }
-        memset(entries,0, sizeof(char*) * numentries);
-        memset(names, 0, sizeof(char*) * numentries);
+        memset(entries, '\0', sizeof(char*) * numentries);
+        memset(names, '\0', sizeof(char*) * numentries);

        /* Collect all the results into our arrays: */
        child = item->child;
@@ -1514,7 +1526,7 @@ static char *print_object(const cJSON *item, int depth, int fmt, printbuffer *p)
            }
            else
            {
-                fail = 1;
+                fail = true;
            }
            child = child->next;
        }
@@ -1526,7 +1538,7 @@ static char *print_object(const cJSON *item, int depth, int fmt, printbuffer *p)
        }
        if (!out)
        {
-            fail = 1;
+            fail = true;
        }

        /* Handle failure */
@@ -1546,7 +1558,7 @@ static char *print_object(const cJSON *item, int depth, int fmt, printbuffer *p)
            }
            cJSON_free(names);
            cJSON_free(entries);
-            return 0;
+            return NULL;
        }

        /* Compose the output: */
@@ -1556,7 +1568,7 @@ static char *print_object(const cJSON *item, int depth, int fmt, printbuffer *p)
        {
            *ptr++ = '\n';
        }
-        *ptr = 0;
+        *ptr = '\0';
        for (i = 0; i < numentries; i++)
        {
            if (fmt)
@@ -1584,7 +1596,7 @@ static char *print_object(const cJSON *item, int depth, int fmt, printbuffer *p)
            {
                *ptr++ = '\n';
            }
-            *ptr = 0;
+            *ptr = '\0';
            cJSON_free(names[i]);
            cJSON_free(entries[i]);
        }
@@ -1620,7 +1632,7 @@ int    cJSON_GetArraySize(const cJSON *array)

 cJSON *cJSON_GetArrayItem(const cJSON *array, int item)
 {
-    cJSON *c = array ? array->child : 0;
+    cJSON *c = array ? array->child : NULL;
    while (c && item > 0)
    {
        item--;
@@ -1632,7 +1644,7 @@ cJSON *cJSON_GetArrayItem(const cJSON *array, int item)

 cJSON *cJSON_GetObjectItem(const cJSON *object, const char *string)
 {
-    cJSON *c = object ? object->child : 0;
+    cJSON *c = object ? object->child : NULL;
    while (c && cJSON_strcasecmp(c->string, string))
    {
        c = c->next;
@@ -1640,7 +1652,7 @@ cJSON *cJSON_GetObjectItem(const cJSON *object, const char *string)
    return c;
 }

-int cJSON_HasObjectItem(const cJSON *object,const char *string)
+cjbool cJSON_HasObjectItem(const cJSON *object,const char *string)
 {
    return cJSON_GetObjectItem(object, string) ? 1 : 0;
 }
@@ -1658,12 +1670,12 @@ static cJSON *create_reference(const cJSON *item)
    cJSON *ref = cJSON_New_Item();
    if (!ref)
    {
-        return 0;
+        return NULL;
    }
    memcpy(ref, item, sizeof(cJSON));
-    ref->string = 0;
+    ref->string = NULL;
    ref->type |= cJSON_IsReference;
-    ref->next = ref->prev = 0;
+    ref->next = ref->prev = NULL;
    return ref;
 }

@@ -1745,7 +1757,7 @@ cJSON *cJSON_DetachItemFromArray(cJSON *array, int which)
    if (!c)
    {
        /* item doesn't exist */
-        return 0;
+        return NULL;
    }
    if (c->prev)
    {
@@ -1761,7 +1773,7 @@ cJSON *cJSON_DetachItemFromArray(cJSON *array, int which)
        array->child = c->next;
    }
    /* make sure the detached item doesn't point anywhere anymore */
-    c->prev = c->next = 0;
+    c->prev = c->next = NULL;

    return c;
 }
@@ -1785,7 +1797,7 @@ cJSON *cJSON_DetachItemFromObject(cJSON *object, const char *string)
        return cJSON_DetachItemFromArray(object, i);
    }

-    return 0;
+    return NULL;
 }

 void cJSON_DeleteItemFromObject(cJSON *object, const char *string)
@@ -1846,7 +1858,7 @@ void cJSON_ReplaceItemInArray(cJSON *array, int which, cJSON *newitem)
    {
        newitem->prev->next = newitem;
    }
-    c->next = c->prev = 0;
+    c->next = c->prev = NULL;
    cJSON_Delete(c);
 }

@@ -1906,7 +1918,7 @@ cJSON *cJSON_CreateFalse(void)
    return item;
 }

-cJSON *cJSON_CreateBool(int b)
+cJSON *cJSON_CreateBool(cjbool b)
 {
    cJSON *item = cJSON_New_Item();
    if(item)
@@ -1940,7 +1952,7 @@ cJSON *cJSON_CreateString(const char *string)
        if(!item->valuestring)
        {
            cJSON_Delete(item);
-            return 0;
+            return NULL;
        }
    }

@@ -1972,9 +1984,9 @@ cJSON *cJSON_CreateObject(void)
 /* Create Arrays: */
 cJSON *cJSON_CreateIntArray(const int *numbers, int count)
 {
-    int i;
-    cJSON *n = 0;
-    cJSON *p = 0;
+    int i = 0;
+    cJSON *n = NULL;
+    cJSON *p = NULL;
    cJSON *a = cJSON_CreateArray();
    for(i = 0; a && (i < count); i++)
    {
@@ -1982,7 +1994,7 @@ cJSON *cJSON_CreateIntArray(const int *numbers, int count)
        if (!n)
        {
            cJSON_Delete(a);
-            return 0;
+            return NULL;
        }
        if(!i)
        {
@@ -2000,9 +2012,9 @@ cJSON *cJSON_CreateIntArray(const int *numbers, int count)

 cJSON *cJSON_CreateFloatArray(const float *numbers, int count)
 {
-    int i;
-    cJSON *n = 0;
-    cJSON *p = 0;
+    int i = 0;
+    cJSON *n = NULL;
+    cJSON *p = NULL;
    cJSON *a = cJSON_CreateArray();
    for(i = 0; a && (i < count); i++)
    {
@@ -2010,7 +2022,7 @@ cJSON *cJSON_CreateFloatArray(const float *numbers, int count)
        if(!n)
        {
            cJSON_Delete(a);
-            return 0;
+            return NULL;
        }
        if(!i)
        {
@@ -2028,9 +2040,9 @@ cJSON *cJSON_CreateFloatArray(const float *numbers, int count)

 cJSON *cJSON_CreateDoubleArray(const double *numbers, int count)
 {
-    int i;
-    cJSON *n = 0;
-    cJSON *p = 0;
+    int i = 0;
+    cJSON *n = NULL;
+    cJSON *p = NULL;
    cJSON *a = cJSON_CreateArray();
    for(i = 0;a && (i < count); i++)
    {
@@ -2038,7 +2050,7 @@ cJSON *cJSON_CreateDoubleArray(const double *numbers, int count)
        if(!n)
        {
            cJSON_Delete(a);
-            return 0;
+            return NULL;
        }
        if(!i)
        {
@@ -2056,9 +2068,9 @@ cJSON *cJSON_CreateDoubleArray(const double *numbers, int count)

 cJSON *cJSON_CreateStringArray(const char **strings, int count)
 {
-    int i;
-    cJSON *n = 0;
-    cJSON *p = 0;
+    int i = 0;
+    cJSON *n = NULL;
+    cJSON *p = NULL;
    cJSON *a = cJSON_CreateArray();
    for (i = 0; a && (i < count); i++)
    {
@@ -2066,7 +2078,7 @@ cJSON *cJSON_CreateStringArray(const char **strings, int count)
        if(!n)
        {
            cJSON_Delete(a);
-            return 0;
+            return NULL;
        }
        if(!i)
        {
@@ -2083,23 +2095,23 @@ cJSON *cJSON_CreateStringArray(const char **strings, int count)
 }

 /* Duplication */
-cJSON *cJSON_Duplicate(const cJSON *item, int recurse)
+cJSON *cJSON_Duplicate(const cJSON *item, cjbool recurse)
 {
-    cJSON *newitem;
-    cJSON *cptr;
-    cJSON *nptr = 0;
-    cJSON *newchild;
+    cJSON *newitem = NULL;
+    cJSON *cptr = NULL;
+    cJSON *nptr = NULL;
+    cJSON *newchild = NULL;

    /* Bail on bad ptr */
    if (!item)
    {
-        return 0;
+        return NULL;
    }
    /* Create new item */
    newitem = cJSON_New_Item();
    if (!newitem)
    {
-        return 0;
+        return NULL;
    }
    /* Copy over all vars */
    newitem->type = item->type & (~cJSON_IsReference);
@@ -2111,7 +2123,7 @@ cJSON *cJSON_Duplicate(const cJSON *item, int recurse)
        if (!newitem->valuestring)
        {
            cJSON_Delete(newitem);
-            return 0;
+            return NULL;
        }
    }
    if (item->string)
@@ -2120,7 +2132,7 @@ cJSON *cJSON_Duplicate(const cJSON *item, int recurse)
        if (!newitem->string)
        {
            cJSON_Delete(newitem);
-            return 0;
+            return NULL;
        }
    }
    /* If non-recursive, then we're done! */
@@ -2136,7 +2148,7 @@ cJSON *cJSON_Duplicate(const cJSON *item, int recurse)
        if (!newchild)
        {
            cJSON_Delete(newitem);
-            return 0;
+            return NULL;
        }
        if (nptr)
        {
--- a/cJSON.h
+++ b/cJSON.h
@@ -28,6 +28,8 @@ extern "C"
 {
 #endif

+#include <stddef.h>
+
 /* cJSON Types: */
 #define cJSON_False  (1 << 0)
 #define cJSON_True   (1 << 1)
--- a/cJSONConfig.cmake.in
+++ b/cJSONConfig.cmake.in
@@ -0,0 +1,29 @@
+# Whether the utils lib was build.
+set(CJSON_UTILS_FOUND @ENABLE_CJSON_UTILS@)
+
+# The include directories used by cJSON
+set(CJSON_INCLUDE_DIRS "@prefix@/@includedir@")
+set(CJSON_INCLUDE_DIR "@prefix@/@includedir@")
+
+get_filename_component(_dir "${CMAKE_CURRENT_LIST_FILE}" PATH)
+
+# The cJSON library
+set(CJSON_LIBRARY "@CJSON_LIB@")
+if(@ENABLE_TARGET_EXPORT@)
+  # Include the target
+  include("${_dir}/cjson.cmake")
+endif()
+
+if(CJSON_UTILS_FOUND)
+  # The cJSON utils library
+  set(CJSON_UTILS_LIBRARY @CJSON_UTILS_LIB@)
+  # All cJSON libraries
+  set(CJSON_LIBRARIES "@CJSON_UTILS_LIB@" "@CJSON_LIB@")
+  if(@ENABLE_TARGET_EXPORT@)
+    # Include the target
+    include("${_dir}/cjson_utils.cmake")
+  endif()
+else()
+  # All cJSON libraries
+  set(CJSON_LIBRARIES "@CJSON_LIB@")
+endif()
--- a/cJSONConfigVersion.cmake.in
+++ b/cJSONConfigVersion.cmake.in
@@ -0,0 +1,11 @@
+set(PACKAGE_VERSION "@PROJECT_VERSION@")
+
+# Check whether the requested PACKAGE_FIND_VERSION is compatible
+if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
+  set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+  set(PACKAGE_VERSION_COMPATIBLE TRUE)
+  if ("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}")
+    set(PACKAGE_VERSION_EXACT TRUE)
+  endif()
+endif()
--- a/cJSON_Utils.c
+++ b/cJSON_Utils.c
@@ -6,13 +6,13 @@

 static char* cJSONUtils_strdup(const char* str)
 {
-    size_t len;
-    char* copy;
+    size_t len = 0;
+    char *copy = NULL;

    len = strlen(str) + 1;
    if (!(copy = (char*)malloc(len)))
    {
-        return 0;
+        return NULL;
    }
    memcpy(copy, str, len);

@@ -131,7 +131,7 @@ char *cJSONUtils_FindPointerFromObjectTo(cJSON *object, cJSON *target)
        char *found = cJSONUtils_FindPointerFromObjectTo(obj, target);
        if (found)
        {
-            if (type == cJSON_Array)
+            if ((type & 0xFF) == cJSON_Array)
            {
                /* reserve enough memory for a 64 bit integer + '/' and '\0' */
                char *ret = (char*)malloc(strlen(found) + 23);
@@ -140,7 +140,7 @@ char *cJSONUtils_FindPointerFromObjectTo(cJSON *object, cJSON *target)

                return ret;
            }
-            else if (type == cJSON_Object)
+            else if ((type & 0xFF) == cJSON_Object)
            {
                char *ret = (char*)malloc(strlen(found) + cJSONUtils_PointerEncodedstrlen(obj->string) + 2);
                *ret = '/';
@@ -153,12 +153,12 @@ char *cJSONUtils_FindPointerFromObjectTo(cJSON *object, cJSON *target)

            /* reached leaf of the tree, found nothing */
            free(found);
-            return 0;
+            return NULL;
        }
    }

    /* not found */
-    return 0;
+    return NULL;
 }

 cJSON *cJSONUtils_GetPointer(cJSON *object, const char *pointer)
@@ -166,7 +166,7 @@ cJSON *cJSONUtils_GetPointer(cJSON *object, const char *pointer)
    /* follow path of the pointer */
    while ((*pointer++ == '/') && object)
    {
-        if (object->type == cJSON_Array)
+        if ((object->type & 0xFF) == cJSON_Array)
        {
            int which = 0;
            /* parse array index */
@@ -177,11 +177,11 @@ cJSON *cJSONUtils_GetPointer(cJSON *object, const char *pointer)
            if (*pointer && (*pointer != '/'))
            {
                /* not end of string or new path token */
-                return 0;
+                return NULL;
            }
            object = cJSON_GetArrayItem(object, which);
        }
-        else if (object->type == cJSON_Object)
+        else if ((object->type & 0xFF) == cJSON_Object)
        {
            object = object->child;
            /* GetObjectItem. */
@@ -197,7 +197,7 @@ cJSON *cJSONUtils_GetPointer(cJSON *object, const char *pointer)
        }
        else
        {
-            return 0;
+            return NULL;
        }
    }

@@ -222,10 +222,10 @@ static void cJSONUtils_InplaceDecodePointerString(char *string)

 static cJSON *cJSONUtils_PatchDetach(cJSON *object, const char *path)
 {
-    char *parentptr = 0;
-    char *childptr = 0;
-    cJSON *parent = 0;
-    cJSON *ret = 0;
+    char *parentptr = NULL;
+    char *childptr = NULL;
+    cJSON *parent = NULL;
+    cJSON *ret = NULL;

    /* copy path and split it in parent and child */
    parentptr = cJSONUtils_strdup(path);
@@ -241,13 +241,13 @@ static cJSON *cJSONUtils_PatchDetach(cJSON *object, const char *path)
    if (!parent)
    {
        /* Couldn't find object to remove child from. */
-        ret = 0;
+        ret = NULL;
    }
-    else if (parent->type == cJSON_Array)
+    else if ((parent->type & 0xFF) == cJSON_Array)
    {
        ret = cJSON_DetachItemFromArray(parent, atoi(childptr));
    }
-    else if (parent->type == cJSON_Object)
+    else if ((parent->type & 0xFF) == cJSON_Object)
    {
        ret = cJSON_DetachItemFromObject(parent, childptr);
    }
@@ -259,12 +259,12 @@ static cJSON *cJSONUtils_PatchDetach(cJSON *object, const char *path)

 static int cJSONUtils_Compare(cJSON *a, cJSON *b)
 {
-    if (a->type != b->type)
+    if ((a->type & 0xFF) != (b->type & 0xFF))
    {
        /* mismatched type. */
        return -1;
    }
-    switch (a->type)
+    switch (a->type & 0xFF)
    {
        case cJSON_Number:
            /* numeric mismatch. */
@@ -290,7 +290,7 @@ static int cJSONUtils_Compare(cJSON *a, cJSON *b)
            b = b->child;
            while (a && b)
            {
-                int err;
+                int err = 0;
                /* compare object keys */
                if (cJSONUtils_strcasecmp(a->string, b->string))
                {
@@ -317,13 +317,13 @@ static int cJSONUtils_Compare(cJSON *a, cJSON *b)

 static int cJSONUtils_ApplyPatch(cJSON *object, cJSON *patch)
 {
-    cJSON *op = 0;
-    cJSON *path = 0;
-    cJSON *value = 0;
-    cJSON *parent = 0;
+    cJSON *op = NULL;
+    cJSON *path = NULL;
+    cJSON *value = NULL;
+    cJSON *parent = NULL;
    int opcode = 0;
-    char *parentptr = 0;
-    char *childptr = 0;
+    char *parentptr = NULL;
+    char *childptr = NULL;

    op = cJSON_GetObjectItem(patch, "op");
    path = cJSON_GetObjectItem(patch, "path");
@@ -448,7 +448,7 @@ static int cJSONUtils_ApplyPatch(cJSON *object, cJSON *patch)
        cJSON_Delete(value);
        return 9;
    }
-    else if (parent->type == cJSON_Array)
+    else if ((parent->type & 0xFF) == cJSON_Array)
    {
        if (!strcmp(childptr, "-"))
        {
@@ -459,7 +459,7 @@ static int cJSONUtils_ApplyPatch(cJSON *object, cJSON *patch)
            cJSON_InsertItemInArray(parent, atoi(childptr), value);
        }
    }
-    else if (parent->type == cJSON_Object)
+    else if ((parent->type & 0xFF) == cJSON_Object)
    {
        cJSON_DeleteItemFromObject(parent, childptr);
        cJSON_AddItemToObject(parent, childptr, value);
@@ -475,8 +475,8 @@ static int cJSONUtils_ApplyPatch(cJSON *object, cJSON *patch)

 int cJSONUtils_ApplyPatches(cJSON *object, cJSON *patches)
 {
-    int err;
-    if (patches->type != cJSON_Array)
+    int err = 0;
+    if ((patches->type & 0xFF) != cJSON_Array)
    {
        /* malformed patches. */
        return 1;
@@ -526,13 +526,13 @@ void cJSONUtils_AddPatchToArray(cJSON *array, const char *op, const char *path,

 static void cJSONUtils_CompareToPatch(cJSON *patches, const char *path, cJSON *from, cJSON *to)
 {
-    if (from->type != to->type)
+    if ((from->type & 0xFF) != (to->type & 0xFF))
    {
        cJSONUtils_GeneratePatch(patches, "replace", path, 0, to);
        return;
    }

-    switch (from->type)
+    switch ((from->type & 0xFF))
    {
        case cJSON_Number:
            if ((from->valueint != to->valueint) || (from->valuedouble != to->valuedouble))
@@ -550,7 +550,7 @@ static void cJSONUtils_CompareToPatch(cJSON *patches, const char *path, cJSON *f

        case cJSON_Array:
        {
-            int c;
+            int c = 0;
            char *newpath = (char*)malloc(strlen(path) + 23); /* Allow space for 64bit int. */
            /* generate patches for all array elements that exist in "from" and "to" */
            for (c = 0, from = from->child, to = to->child; from && to; from = from->next, to = to->next, c++)
@@ -575,8 +575,8 @@ static void cJSONUtils_CompareToPatch(cJSON *patches, const char *path, cJSON *f

        case cJSON_Object:
        {
-            cJSON *a;
-            cJSON *b;
+            cJSON *a = NULL;
+            cJSON *b = NULL;
            cJSONUtils_SortObject(from);
            cJSONUtils_SortObject(to);

@@ -666,13 +666,13 @@ static cJSON *cJSONUtils_SortList(cJSON *list)
    if (second && second->prev)
    {
        /* Split the lists */
-        second->prev->next = 0;
+        second->prev->next = NULL;
    }

    /* Recursively sort the sub-lists. */
    first = cJSONUtils_SortList(first);
    second = cJSONUtils_SortList(second);
-    list = ptr = 0;
+    list = ptr = NULL;

    while (first && second) /* Merge the sub-lists */
    {
@@ -740,14 +740,14 @@ void cJSONUtils_SortObject(cJSON *object)

 cJSON* cJSONUtils_MergePatch(cJSON *target, cJSON *patch)
 {
-    if (!patch || (patch->type != cJSON_Object))
+    if (!patch || ((patch->type & 0xFF) != cJSON_Object))
    {
        /* scalar value, array or NULL, just duplicate */
        cJSON_Delete(target);
        return cJSON_Duplicate(patch, 1);
    }

-    if (!target || (target->type != cJSON_Object))
+    if (!target || ((target->type & 0xFF) != cJSON_Object))
    {
        cJSON_Delete(target);
        target = cJSON_CreateObject();
@@ -756,7 +756,7 @@ cJSON* cJSONUtils_MergePatch(cJSON *target, cJSON *patch)
    patch = patch->child;
    while (patch)
    {
-        if (patch->type == cJSON_NULL)
+        if ((patch->type & 0xFF) == cJSON_NULL)
        {
            /* NULL is the indicator to remove a value, see RFC7396 */
            cJSON_DeleteItemFromObject(target, patch->string);
@@ -773,13 +773,13 @@ cJSON* cJSONUtils_MergePatch(cJSON *target, cJSON *patch)

 cJSON *cJSONUtils_GenerateMergePatch(cJSON *from, cJSON *to)
 {
-    cJSON *patch = 0;
+    cJSON *patch = NULL;
    if (!to)
    {
        /* patch to delete everything */
        return cJSON_CreateNull();
    }
-    if ((to->type != cJSON_Object) || !from || (from->type != cJSON_Object))
+    if (((to->type & 0xFF) != cJSON_Object) || !from || ((from->type & 0xFF) != cJSON_Object))
    {
        return cJSON_Duplicate(to, 1);
    }
@@ -821,7 +821,7 @@ cJSON *cJSONUtils_GenerateMergePatch(cJSON *from, cJSON *to)
    if (!patch->child)
    {
        cJSON_Delete(patch);
-        return 0;
+        return NULL;
    }

    return patch;
--- a/libcjson.pc.in
+++ b/libcjson.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=${prefix}/@libdir@
+includedir=${prefix}/@includedir@
+
+Name: libcjson
+Version: @version@
+Description: Ultralightweight JSON parser in ANSI C
+URL: https://github.com/DaveGamble/cJSON
+Libs: -L${libdir} -lcjson
+Libs.Private: -lm
+Cflags: -I${includedir}
--- a/libcjson_utils.pc.in
+++ b/libcjson_utils.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+libdir=${prefix}/@libdir@
+includedir=${prefix}/@includedir@
+
+Name: libcjson_utils
+Version: @version@
+Description: An implementation of JSON Pointer, Patch and Merge Patch based on cJSON.
+URL: https://github.com/DaveGamble/cJSON
+Libs: -L${libdir} -lcjson_utils
+Cflags: -I${includedir}
+Requires: libcjson
--- a/test.c
+++ b/test.c
@@ -27,8 +27,8 @@
 /* Parse text to JSON, then render back to text, and print! */
 void doit(char *text)
 {
-    char *out;
-    cJSON *json;
+    char *out = NULL;
+    cJSON *json = NULL;

    json = cJSON_Parse(text);
    if (!json)
@@ -47,9 +47,9 @@ void doit(char *text)
 /* Read a file, parse, render back, etc. */
 void dofile(char *filename)
 {
-    FILE *f;
-    long len;
-    char *data;
+    FILE *f = NULL;
+    long len = 0;
+    char *data = NULL;

    /* open in read binary mode */
    f = fopen(filename,"rb");
@@ -85,13 +85,13 @@ struct record
 void create_objects(void)
 {
    /* declare a few. */
-    cJSON *root;
-    cJSON *fmt;
-    cJSON *img;
-    cJSON *thm;
-    cJSON *fld;
-    char *out;
-    int i;
+    cJSON *root = NULL;
+    cJSON *fmt = NULL;
+    cJSON *img = NULL;
+    cJSON *thm = NULL;
+    cJSON *fld = NULL;
+    char *out = NULL;
+    int i = 0;

    /* Our "days of the week" array: */
    const char *strings[7] =
--- a/test_utils.c
+++ b/test_utils.c
@@ -5,167 +5,202 @@

 int main(void)
 {
-	/* Some variables */
-	char *temp = NULL;
-	char *patchtext = NULL;
-	char *patchedtext = NULL;
+    /* Some variables */
+    char *temp = NULL;
+    char *patchtext = NULL;
+    char *patchedtext = NULL;

-	int i;
-	/* JSON Pointer tests: */
-	cJSON *root;
-	const char *json="{"
-		"\"foo\": [\"bar\", \"baz\"],"
-		"\"\": 0,"
-		"\"a/b\": 1,"
-		"\"c%d\": 2,"
-		"\"e^f\": 3,"
-		"\"g|h\": 4,"
-		"\"i\\\\j\": 5,"
-		"\"k\\\"l\": 6,"
-		"\" \": 7,"
-		"\"m~n\": 8"
-	"}";
-   
-	const char *tests[12]={"","/foo","/foo/0","/","/a~1b","/c%d","/e^f","/g|h","/i\\j","/k\"l","/ ","/m~0n"};
-   
-	/* JSON Apply Patch tests: */
-	const char *patches[15][3]={
-	{"{ \"foo\": \"bar\"}", "[{ \"op\": \"add\", \"path\": \"/baz\", \"value\": \"qux\" }]","{\"baz\": \"qux\",\"foo\": \"bar\"}"},
-	{"{ \"foo\": [ \"bar\", \"baz\" ] }", "[{ \"op\": \"add\", \"path\": \"/foo/1\", \"value\": \"qux\" }]","{\"foo\": [ \"bar\", \"qux\", \"baz\" ] }"},
-	{"{\"baz\": \"qux\",\"foo\": \"bar\"}"," [{ \"op\": \"remove\", \"path\": \"/baz\" }]","{\"foo\": \"bar\" }"},
-	{"{ \"foo\": [ \"bar\", \"qux\", \"baz\" ] }","[{ \"op\": \"remove\", \"path\": \"/foo/1\" }]","{\"foo\": [ \"bar\", \"baz\" ] }"},
-	{"{ \"baz\": \"qux\",\"foo\": \"bar\"}","[{ \"op\": \"replace\", \"path\": \"/baz\", \"value\": \"boo\" }]","{\"baz\": \"boo\",\"foo\": \"bar\"}"},
-	{"{\"foo\": {\"bar\": \"baz\",\"waldo\": \"fred\"},\"qux\": {\"corge\": \"grault\"}}","[{ \"op\": \"move\", \"from\": \"/foo/waldo\", \"path\": \"/qux/thud\" }]","{\"foo\": {\"bar\": \"baz\"},\"qux\": {\"corge\": \"grault\",\"thud\": \"fred\"}}"},
-	{"{ \"foo\": [ \"all\", \"grass\", \"cows\", \"eat\" ] }","[ { \"op\": \"move\", \"from\": \"/foo/1\", \"path\": \"/foo/3\" }]","{ \"foo\": [ \"all\", \"cows\", \"eat\", \"grass\" ] }"},
-	{"{\"baz\": \"qux\",\"foo\": [ \"a\", 2, \"c\" ]}","[{ \"op\": \"test\", \"path\": \"/baz\", \"value\": \"qux\" },{ \"op\": \"test\", \"path\": \"/foo/1\", \"value\": 2 }]",""},
-	{"{ \"baz\": \"qux\" }","[ { \"op\": \"test\", \"path\": \"/baz\", \"value\": \"bar\" }]",""},
-	{"{ \"foo\": \"bar\" }","[{ \"op\": \"add\", \"path\": \"/child\", \"value\": { \"grandchild\": { } } }]","{\"foo\": \"bar\",\"child\": {\"grandchild\": {}}}"},
-	{"{ \"foo\": \"bar\" }","[{ \"op\": \"add\", \"path\": \"/baz\", \"value\": \"qux\", \"xyz\": 123 }]","{\"foo\": \"bar\",\"baz\": \"qux\"}"},
-	{"{ \"foo\": \"bar\" }","[{ \"op\": \"add\", \"path\": \"/baz/bat\", \"value\": \"qux\" }]",""},
-	{"{\"/\": 9,\"~1\": 10}","[{\"op\": \"test\", \"path\": \"/~01\", \"value\": 10}]",""},
-	{"{\"/\": 9,\"~1\": 10}","[{\"op\": \"test\", \"path\": \"/~01\", \"value\": \"10\"}]",""},
-	{"{ \"foo\": [\"bar\"] }","[ { \"op\": \"add\", \"path\": \"/foo/-\", \"value\": [\"abc\", \"def\"] }]","{\"foo\": [\"bar\", [\"abc\", \"def\"]] }"}};
-	
-	/* JSON Apply Merge tests: */
-	const char *merges[15][3]={
-		{"{\"a\":\"b\"}", "{\"a\":\"c\"}", "{\"a\":\"c\"}"},
-		{"{\"a\":\"b\"}", "{\"b\":\"c\"}", "{\"a\":\"b\",\"b\":\"c\"}"},
-		{"{\"a\":\"b\"}", "{\"a\":null}", "{}"},
-		{"{\"a\":\"b\",\"b\":\"c\"}", "{\"a\":null}", "{\"b\":\"c\"}"},
-		{"{\"a\":[\"b\"]}", "{\"a\":\"c\"}", "{\"a\":\"c\"}"},
-		{"{\"a\":\"c\"}", "{\"a\":[\"b\"]}", "{\"a\":[\"b\"]}"},
-		{"{\"a\":{\"b\":\"c\"}}", "{\"a\":{\"b\":\"d\",\"c\":null}}", "{\"a\":{\"b\":\"d\"}}"},
-		{"{\"a\":[{\"b\":\"c\"}]}", "{\"a\":[1]}", "{\"a\":[1]}"},
-		{"[\"a\",\"b\"]", "[\"c\",\"d\"]", "[\"c\",\"d\"]"},
-		{"{\"a\":\"b\"}", "[\"c\"]", "[\"c\"]"},
-		{"{\"a\":\"foo\"}", "null", "null"},
-		{"{\"a\":\"foo\"}", "\"bar\"", "\"bar\""},
-		{"{\"e\":null}", "{\"a\":1}", "{\"e\":null,\"a\":1}"},
-		{"[1,2]", "{\"a\":\"b\",\"c\":null}", "{\"a\":\"b\"}"},
-		{"{}","{\"a\":{\"bb\":{\"ccc\":null}}}", "{\"a\":{\"bb\":{}}}"}};
-		
+    int i = 0;
+    /* JSON Pointer tests: */
+    cJSON *root = NULL;
+    const char *json=
+        "{"
+        "\"foo\": [\"bar\", \"baz\"],"
+        "\"\": 0,"
+        "\"a/b\": 1,"
+        "\"c%d\": 2,"
+        "\"e^f\": 3,"
+        "\"g|h\": 4,"
+        "\"i\\\\j\": 5,"
+        "\"k\\\"l\": 6,"
+        "\" \": 7,"
+        "\"m~n\": 8"
+        "}";

-	/* Misc tests */
-	int numbers[10]={0,1,2,3,4,5,6,7,8,9};
-	const char *random="QWERTYUIOPASDFGHJKLZXCVBNM";
-	char buf[2]={0,0},*before,*after;
-	cJSON *object,*nums,*num6,*sortme;
+    const char *tests[12] = {"","/foo","/foo/0","/","/a~1b","/c%d","/e^f","/g|h","/i\\j","/k\"l","/ ","/m~0n"};
+
+    /* JSON Apply Patch tests: */
+    const char *patches[15][3] =
+    {
+        {"{ \"foo\": \"bar\"}", "[{ \"op\": \"add\", \"path\": \"/baz\", \"value\": \"qux\" }]","{\"baz\": \"qux\",\"foo\": \"bar\"}"},
+        {"{ \"foo\": [ \"bar\", \"baz\" ] }", "[{ \"op\": \"add\", \"path\": \"/foo/1\", \"value\": \"qux\" }]","{\"foo\": [ \"bar\", \"qux\", \"baz\" ] }"},
+        {"{\"baz\": \"qux\",\"foo\": \"bar\"}"," [{ \"op\": \"remove\", \"path\": \"/baz\" }]","{\"foo\": \"bar\" }"},
+        {"{ \"foo\": [ \"bar\", \"qux\", \"baz\" ] }","[{ \"op\": \"remove\", \"path\": \"/foo/1\" }]","{\"foo\": [ \"bar\", \"baz\" ] }"},
+        {"{ \"baz\": \"qux\",\"foo\": \"bar\"}","[{ \"op\": \"replace\", \"path\": \"/baz\", \"value\": \"boo\" }]","{\"baz\": \"boo\",\"foo\": \"bar\"}"},
+        {"{\"foo\": {\"bar\": \"baz\",\"waldo\": \"fred\"},\"qux\": {\"corge\": \"grault\"}}","[{ \"op\": \"move\", \"from\": \"/foo/waldo\", \"path\": \"/qux/thud\" }]","{\"foo\": {\"bar\": \"baz\"},\"qux\": {\"corge\": \"grault\",\"thud\": \"fred\"}}"},
+        {"{ \"foo\": [ \"all\", \"grass\", \"cows\", \"eat\" ] }","[ { \"op\": \"move\", \"from\": \"/foo/1\", \"path\": \"/foo/3\" }]","{ \"foo\": [ \"all\", \"cows\", \"eat\", \"grass\" ] }"},
+        {"{\"baz\": \"qux\",\"foo\": [ \"a\", 2, \"c\" ]}","[{ \"op\": \"test\", \"path\": \"/baz\", \"value\": \"qux\" },{ \"op\": \"test\", \"path\": \"/foo/1\", \"value\": 2 }]",""},
+        {"{ \"baz\": \"qux\" }","[ { \"op\": \"test\", \"path\": \"/baz\", \"value\": \"bar\" }]",""},
+        {"{ \"foo\": \"bar\" }","[{ \"op\": \"add\", \"path\": \"/child\", \"value\": { \"grandchild\": { } } }]","{\"foo\": \"bar\",\"child\": {\"grandchild\": {}}}"},
+        {"{ \"foo\": \"bar\" }","[{ \"op\": \"add\", \"path\": \"/baz\", \"value\": \"qux\", \"xyz\": 123 }]","{\"foo\": \"bar\",\"baz\": \"qux\"}"},
+        {"{ \"foo\": \"bar\" }","[{ \"op\": \"add\", \"path\": \"/baz/bat\", \"value\": \"qux\" }]",""},
+        {"{\"/\": 9,\"~1\": 10}","[{\"op\": \"test\", \"path\": \"/~01\", \"value\": 10}]",""},
+        {"{\"/\": 9,\"~1\": 10}","[{\"op\": \"test\", \"path\": \"/~01\", \"value\": \"10\"}]",""},
+        {"{ \"foo\": [\"bar\"] }","[ { \"op\": \"add\", \"path\": \"/foo/-\", \"value\": [\"abc\", \"def\"] }]","{\"foo\": [\"bar\", [\"abc\", \"def\"]] }"}
+    };
+
+    /* JSON Apply Merge tests: */
+    const char *merges[15][3] =
+    {
+        {"{\"a\":\"b\"}", "{\"a\":\"c\"}", "{\"a\":\"c\"}"},
+        {"{\"a\":\"b\"}", "{\"b\":\"c\"}", "{\"a\":\"b\",\"b\":\"c\"}"},
+        {"{\"a\":\"b\"}", "{\"a\":null}", "{}"},
+        {"{\"a\":\"b\",\"b\":\"c\"}", "{\"a\":null}", "{\"b\":\"c\"}"},
+        {"{\"a\":[\"b\"]}", "{\"a\":\"c\"}", "{\"a\":\"c\"}"},
+        {"{\"a\":\"c\"}", "{\"a\":[\"b\"]}", "{\"a\":[\"b\"]}"},
+        {"{\"a\":{\"b\":\"c\"}}", "{\"a\":{\"b\":\"d\",\"c\":null}}", "{\"a\":{\"b\":\"d\"}}"},
+        {"{\"a\":[{\"b\":\"c\"}]}", "{\"a\":[1]}", "{\"a\":[1]}"},
+        {"[\"a\",\"b\"]", "[\"c\",\"d\"]", "[\"c\",\"d\"]"},
+        {"{\"a\":\"b\"}", "[\"c\"]", "[\"c\"]"},
+        {"{\"a\":\"foo\"}", "null", "null"},
+        {"{\"a\":\"foo\"}", "\"bar\"", "\"bar\""},
+        {"{\"e\":null}", "{\"a\":1}", "{\"e\":null,\"a\":1}"},
+        {"[1,2]", "{\"a\":\"b\",\"c\":null}", "{\"a\":\"b\"}"},
+        {"{}","{\"a\":{\"bb\":{\"ccc\":null}}}", "{\"a\":{\"bb\":{}}}"}
+    };


-
-	printf("JSON Pointer Tests\n");
-	root=cJSON_Parse(json);
-	for (i=0;i<12;i++)
-	{
-		char *output=cJSON_Print(cJSONUtils_GetPointer(root,tests[i]));
-		printf("Test %d:\n%s\n\n",i+1,output);
-		free(output);
-	}
-	cJSON_Delete(root);
+    /* Misc tests */
+    int numbers[10] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
+    const char *random = "QWERTYUIOPASDFGHJKLZXCVBNM";
+    char buf[2] = {0,0};
+    char *before = NULL;
+    char *after = NULL;
+    cJSON *object = NULL;
+    cJSON *nums = NULL;
+    cJSON *num6 = NULL;
+    cJSON *sortme = NULL;


-	printf("JSON Apply Patch Tests\n");
-	for (i=0;i<15;i++)
-	{
-		cJSON *object=cJSON_Parse(patches[i][0]);
-		cJSON *patch=cJSON_Parse(patches[i][1]);
-		int err=cJSONUtils_ApplyPatches(object,patch);
-		char *output=cJSON_Print(object);
-		printf("Test %d (err %d):\n%s\n\n",i+1,err,output);
-		free(output);cJSON_Delete(object);cJSON_Delete(patch);
-	}
+    printf("JSON Pointer Tests\n");
+    root = cJSON_Parse(json);
+    for (i = 0; i < 12; i++)
+    {
+        char *output = cJSON_Print(cJSONUtils_GetPointer(root, tests[i]));
+        printf("Test %d:\n%s\n\n", i + 1, output);
+        free(output);
+    }
+    cJSON_Delete(root);

-	/* JSON Generate Patch tests: */
-	printf("JSON Generate Patch Tests\n");
-	for (i=0;i<15;i++)
-	{
-		cJSON *from,*to,*patch;char *out;
-		if (!strlen(patches[i][2])) continue;
-		from=cJSON_Parse(patches[i][0]);
-		to=cJSON_Parse(patches[i][2]);
-		patch=cJSONUtils_GeneratePatches(from,to);
-		out=cJSON_Print(patch);
-		printf("Test %d: (patch: %s):\n%s\n\n",i+1,patches[i][1],out);
-		free(out);cJSON_Delete(from);cJSON_Delete(to);cJSON_Delete(patch);
-	}

-	/* Misc tests: */
-	printf("JSON Pointer construct\n");
-	object=cJSON_CreateObject();
-	nums=cJSON_CreateIntArray(numbers,10);
-	num6=cJSON_GetArrayItem(nums,6);
-	cJSON_AddItemToObject(object,"numbers",nums);
-	temp=cJSONUtils_FindPointerFromObjectTo(object,num6);
-	printf("Pointer: [%s]\n",temp);
-	free(temp);
-	temp=cJSONUtils_FindPointerFromObjectTo(object,nums);
-	printf("Pointer: [%s]\n",temp);
-	free(temp);
-	temp=cJSONUtils_FindPointerFromObjectTo(object,object);
-	printf("Pointer: [%s]\n",temp);
-	free(temp);
-	cJSON_Delete(object);
+    printf("JSON Apply Patch Tests\n");
+    for (i = 0; i < 15; i++)
+    {
+        cJSON *object = cJSON_Parse(patches[i][0]);
+        cJSON *patch = cJSON_Parse(patches[i][1]);
+        int err = cJSONUtils_ApplyPatches(object, patch);
+        char *output = cJSON_Print(object);
+        printf("Test %d (err %d):\n%s\n\n", i + 1, err, output);

-	/* JSON Sort test: */
-	sortme=cJSON_CreateObject();
-	for (i=0;i<26;i++)
-	{
-		buf[0]=random[i];cJSON_AddItemToObject(sortme,buf,cJSON_CreateNumber(1));
-	}
-	before=cJSON_PrintUnformatted(sortme);
-	cJSONUtils_SortObject(sortme);
-	after=cJSON_PrintUnformatted(sortme);
-	printf("Before: [%s]\nAfter: [%s]\n\n",before,after);
-	free(before);free(after);cJSON_Delete(sortme);		
-	
-	/* Merge tests: */
-	printf("JSON Merge Patch tests\n");
-	for (i=0;i<15;i++)
-	{
-		cJSON *object=cJSON_Parse(merges[i][0]);
-		cJSON *patch=cJSON_Parse(merges[i][1]);
-		char *before=cJSON_PrintUnformatted(object);
-		patchtext=cJSON_PrintUnformatted(patch);
-		printf("Before: [%s] -> [%s] = ",before,patchtext);
-		object=cJSONUtils_MergePatch(object,patch);
-		after=cJSON_PrintUnformatted(object);
-		printf("[%s] vs [%s] (%s)\n",after,merges[i][2],strcmp(after,merges[i][2])?"FAIL":"OK");
+        free(output);
+        cJSON_Delete(object);
+        cJSON_Delete(patch);
+    }

-		free(before);free(patchtext);free(after);cJSON_Delete(object);cJSON_Delete(patch);
-	}
-	
-	/* Generate Merge tests: */
-	for (i=0;i<15;i++)
-	{
-		cJSON *from=cJSON_Parse(merges[i][0]);
-		cJSON *to=cJSON_Parse(merges[i][2]);
-		cJSON *patch=cJSONUtils_GenerateMergePatch(from,to);
-		from=cJSONUtils_MergePatch(from,patch);
-		patchtext=cJSON_PrintUnformatted(patch);
-		patchedtext=cJSON_PrintUnformatted(from);
-		printf("Patch [%s] vs [%s] = [%s] vs [%s] (%s)\n",patchtext,merges[i][1],patchedtext,merges[i][2],strcmp(patchedtext,merges[i][2])?"FAIL":"OK");
-		cJSON_Delete(from);cJSON_Delete(to);cJSON_Delete(patch);free(patchtext);free(patchedtext);
-	}
+    /* JSON Generate Patch tests: */
+    printf("JSON Generate Patch Tests\n");
+    for (i = 0; i < 15; i++)
+    {
+        cJSON *from;
+        cJSON *to;
+        cJSON *patch;
+        char *out;
+        if (!strlen(patches[i][2]))
+        {
+            continue;
+        }
+        from = cJSON_Parse(patches[i][0]);
+        to = cJSON_Parse(patches[i][2]);
+        patch = cJSONUtils_GeneratePatches(from, to);
+        out = cJSON_Print(patch);
+        printf("Test %d: (patch: %s):\n%s\n\n", i + 1, patches[i][1], out);

-	return 0;
+        free(out);
+        cJSON_Delete(from);
+        cJSON_Delete(to);
+        cJSON_Delete(patch);
+    }
+
+    /* Misc tests: */
+    printf("JSON Pointer construct\n");
+    object = cJSON_CreateObject();
+    nums = cJSON_CreateIntArray(numbers, 10);
+    num6 = cJSON_GetArrayItem(nums, 6);
+    cJSON_AddItemToObject(object, "numbers", nums);
+    temp = cJSONUtils_FindPointerFromObjectTo(object, num6);
+    printf("Pointer: [%s]\n", temp);
+    free(temp);
+    temp = cJSONUtils_FindPointerFromObjectTo(object, nums);
+    printf("Pointer: [%s]\n", temp);
+    free(temp);
+    temp = cJSONUtils_FindPointerFromObjectTo(object, object);
+    printf("Pointer: [%s]\n", temp);
+    free(temp);
+    cJSON_Delete(object);
+
+    /* JSON Sort test: */
+    sortme = cJSON_CreateObject();
+    for (i = 0; i < 26; i++)
+    {
+        buf[0] = random[i];
+        cJSON_AddItemToObject(sortme, buf, cJSON_CreateNumber(1));
+    }
+    before = cJSON_PrintUnformatted(sortme);
+    cJSONUtils_SortObject(sortme);
+    after = cJSON_PrintUnformatted(sortme);
+    printf("Before: [%s]\nAfter: [%s]\n\n", before, after);
+
+    free(before);
+    free(after);
+    cJSON_Delete(sortme);
+
+    /* Merge tests: */
+    printf("JSON Merge Patch tests\n");
+    for (i = 0; i < 15; i++)
+    {
+        cJSON *object = cJSON_Parse(merges[i][0]);
+        cJSON *patch = cJSON_Parse(merges[i][1]);
+        char *before = cJSON_PrintUnformatted(object);
+        patchtext = cJSON_PrintUnformatted(patch);
+        printf("Before: [%s] -> [%s] = ", before, patchtext);
+        object = cJSONUtils_MergePatch(object, patch);
+        after = cJSON_PrintUnformatted(object);
+        printf("[%s] vs [%s] (%s)\n", after, merges[i][2], strcmp(after, merges[i][2]) ? "FAIL" : "OK");
+
+        free(before);
+        free(patchtext);
+        free(after);
+        cJSON_Delete(object);
+        cJSON_Delete(patch);
+    }
+
+    /* Generate Merge tests: */
+    for (i = 0; i < 15; i++)
+    {
+        cJSON *from = cJSON_Parse(merges[i][0]);
+        cJSON *to = cJSON_Parse(merges[i][2]);
+        cJSON *patch = cJSONUtils_GenerateMergePatch(from,to);
+        from = cJSONUtils_MergePatch(from,patch);
+        patchtext = cJSON_PrintUnformatted(patch);
+        patchedtext = cJSON_PrintUnformatted(from);
+        printf("Patch [%s] vs [%s] = [%s] vs [%s] (%s)\n", patchtext, merges[i][1], patchedtext, merges[i][2], strcmp(patchedtext, merges[i][2]) ? "FAIL" : "OK");
+
+        cJSON_Delete(from);
+        cJSON_Delete(to);
+        cJSON_Delete(patch);
+        free(patchtext);
+        free(patchedtext);
+    }
+
+    return 0;
 }
Author	SHA1	Message	Date
Max Bruckner	d0a9f46888	Release v1.0.2	2016-11-25 08:22:41 +07:00
Max Bruckner	23b269d5f9	Rename bool -> cjbool, fix #71	2016-11-25 08:19:18 +07:00
Max Bruckner	11fd27ade7	Change version to 1.0.1	2016-11-20 01:08:54 +07:00
Max Bruckner	65ac0a1a2b	cJSON_Utils tests: fix formatting	2016-11-19 17:50:01 +07:00
Max Bruckner	679004914f	Define a boolean type This is not changing the behavior of the code, but it is improving the readability and helps to make the intention clearer. One thing to take care: 'true' should never be compared against.	2016-11-19 17:29:22 +07:00
Max Bruckner	b88da9b0de	Initialize all variables	2016-11-19 17:29:21 +07:00
Max Bruckner	a5ff796c20	Replace 0 with more expressive NULL or '\0'	2016-11-19 17:28:14 +07:00
Max Bruckner	d47339e274	cJSON_Utils: Fix comparing of cJSON_ types When comparing the type, it has to be masked with 0xFF because of cJSON_IsConst and cJSON_IsReference.	2016-11-18 22:52:52 +07:00
Max Bruckner	aafb64a1c5	Merge pull request #66 from DaveGamble/v1 Release version 1.0.0	2016-11-17 08:19:08 +07:00
Max Bruckner	3a2151d267	README: Document ENABLE_CUSTOM_COMPILER_FLAGS	2016-11-15 20:23:47 +07:00
Max Bruckner	f2cb5e4dd4	CMake: ENABLE_CUSTOM_COMPILER_FLAGS option	2016-11-15 20:21:57 +07:00
Max Bruckner	46a3a102d5	CMake: Fix indentation	2016-11-15 20:21:30 +07:00
Max Bruckner	1f3b95e2b1	README: Compiles on FreeBSD	2016-11-15 20:19:02 +07:00
Max Bruckner	706636fb20	Replace -ansi with -std=c89 for better compatibility	2016-11-15 20:03:11 +07:00
Max Bruckner	a22da43578	README: More formatting	2016-11-15 08:12:35 +07:00
Max Bruckner	df1ffa1e0b	README: Building	2016-11-15 02:01:38 +07:00
Max Bruckner	501be02690	README: Reformat	2016-11-15 00:29:23 +07:00
Max Bruckner	778bcd1a62	Makefile: Redo with library versioning And remove special handling of SunOs	2016-11-14 22:52:44 +07:00
Max Bruckner	46ff20c8b0	cJSON.h: add stddef.h because of size_t	2016-11-14 22:25:16 +07:00
Max Bruckner	5cca67e3fc	CMake: Build tests by default	2016-11-14 19:36:04 +07:00
Max Bruckner	dc4b62915a	fix #10 , now failing on incorrect escape sequences	2016-11-14 19:33:03 +07:00
Max Bruckner	afd690d1c9	format fix	2016-11-14 19:14:14 +07:00
Max Bruckner	cfd0fb83d3	CMake: Fix warning on Cygwin	2016-11-14 19:14:14 +07:00
Max Bruckner	c213f2eb58	cJSON: Option to disable exporting targets This can be disabled when the exporting of the targets causes problems.	2016-11-14 19:14:13 +07:00
Max Bruckner	5838e279a5	CMake: Use CMAKE_C_FLAGS instead of add_compile_options This is for compatibility reasons with old CMake 2.8 versions.	2016-11-14 19:14:13 +07:00
Max Bruckner	966646d70e	CMake config: Add CJSON_INCLUDE_DIR	2016-11-14 19:14:13 +07:00
Max Bruckner	58b76b518a	CMake: Fix export of targets The prior approach was exporting paths from the build environment.	2016-11-14 19:14:13 +07:00
Max Bruckner	8a838b37e3	CMake: Use standard variables for the version	2016-11-14 19:14:12 +07:00
Max Bruckner	de992ec3c9	pkg-config: Add URL and link math library	2016-11-14 19:14:12 +07:00
Max Bruckner	f9ce93029a	Buildsystem: Fix paths Fix library and include paths in pkg-config, CMakeLists.txt and the CMake config files.	2016-11-14 19:14:12 +07:00
Markus Blatt	251e5a5e34	Added rudimentary package configuration files. These files will allow cmake based projects to find the library using find_package(cJSON). If successful, they can use CJSON_LIBRARIES and CJSON_INCLUDE_DIRS. Other build systems can use a similar approach to pkg-config: cmake --find-package -DNAME=cJSON -DCOMPILER_ID=GNU -DLANGUAGE=C -DCMAKE_PREFIX_PATH=<path-to-non-sytem-installation-path> -DMODE=LINK or with MODE COMPILE or EXISTS.	2016-11-14 19:14:12 +07:00
Max Bruckner	8a7f9a2101	CMake: Use the GNUInstallDirs module	2016-11-14 19:14:12 +07:00
Max Bruckner	78cdb0d6ec	CMake: Quote all variables	2016-11-14 19:14:11 +07:00
Max Bruckner	b2283dab87	CMake: Use CMAKE_CURRENT_SOURCE/BINARY_DIR	2016-11-14 19:14:11 +07:00
Max Bruckner	3353062fc8	CMake: Make building of cJSON_Utils optional Turned off by default.	2016-11-14 19:14:11 +07:00
Max Bruckner	97b255c736	CMake: Fix installation of libcjson_utils.pc	2016-11-14 19:14:11 +07:00
Max Bruckner	fad10d5b1e	Update list of contributors	2016-11-14 19:14:11 +07:00
Max Bruckner	302c574e00	CMake: Add compiler options only for Clang and GCC	2016-11-14 19:14:10 +07:00
Max Bruckner	576d9bb24f	CMake: Only one project	2016-11-14 19:14:10 +07:00
Max Bruckner	47841ed3a7	CMake: Build test by default	2016-11-14 19:14:10 +07:00
Max Bruckner	c3fecc2d07	CMake: Build shared libraries by default This is also what other projects are doing.	2016-11-14 19:14:10 +07:00
Max Bruckner	9acd1c6e7e	Add list of contributors	2016-11-14 19:14:10 +07:00
Max Bruckner	aee8cb9231	pkg-config: Add libcjson_utils.pc	2016-11-14 19:14:09 +07:00
Max Bruckner	3d546c7036	pkg-config: Update libcjson.pc.in	2016-11-14 19:14:09 +07:00
Paulo Antonio Alvarez	d5baeff85f	Add pkg-config file support for libcjson We configure and install a pkg-config file so that our compilation and linking flags can be more easily found using pkg-config.	2016-11-14 19:14:09 +07:00
Max Bruckner	32a9870786	CMake: Separate so version for cJSON_Utils	2016-11-14 19:14:09 +07:00
Max Bruckner	fd38fb712d	CMake: Add compile options	2016-11-14 19:14:09 +07:00
Max Bruckner	ba6389291f	CMake: Set library version	2016-11-14 19:14:08 +07:00
Max Bruckner	ba593394d4	CMake: Change include directory cJSON -> cjson	2016-11-14 19:14:08 +07:00
Max Bruckner	0d6ccf032d	CMake: Change library names to all lowercase Library names: libcJSON -> libcjson libcJSON_utils -> libcjson_utils	2016-11-14 19:14:08 +07:00
Max Bruckner	34361dbb9b	CMake: Reformat	2016-11-14 19:14:08 +07:00
Max Bruckner	81e95718d5	CMake: Regroup lines	2016-11-14 19:14:07 +07:00
Max Bruckner	9a4657fbee	CMake: Set version and soversion	2016-11-14 19:14:07 +07:00
Max Bruckner	8a46cb7b55	gitignore: ignore build directory	2016-11-14 19:14:07 +07:00