jansson 2.14

akheron · Sep 9, 2021 · 684e18c · 684e18c
1 parent e950e57
commit 684e18c
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 16 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,28 @@
+Version 2.14
+============
+
+Released 2021-09-09
+
+* New Features:
+
+  - Add `json_object_getn`, `json_object_setn`, `json_object_deln`, and the
+    corresponding `nocheck` functions. (#520, by Maxim Zhukov)
+
+* Fixes:
+
+  - Handle `sprintf` corner cases (#537, by Tobias Stoeckmann)
+
+* Build:
+
+  - Symbol versioning for all exported symbols (#540, by Simon McVittie)
+  - Fix compiler warnings (#555, by Kelvin Lee)
+
+* Documentation:
+
+  - Small fixes (#544, #546, by @i-ky)
+  - Sphinx 3 compatibility (#543, by Pierce Lopez)
+
+
 Version 2.13.1
 ==============
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -35,10 +35,10 @@ endif()
 # set (JANSSON_VERSION "2.3.1")
 # set (JANSSON_SOVERSION 2)
 
-set(JANSSON_DISPLAY_VERSION "2.13.1")
+set(JANSSON_DISPLAY_VERSION "2.14")
 
 # This is what is required to match the same numbers as automake's
-set(JANSSON_VERSION "4.13.0")
+set(JANSSON_VERSION "4.14.0")
 set(JANSSON_SOVERSION 4)
 
 # for CheckFunctionKeywords

diff --git a/configure.ac b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.60])
-AC_INIT([jansson], [2.13.1], [https://github.com/akheron/jansson/issues])
+AC_INIT([jansson], [2.14], [https://github.com/akheron/jansson/issues])
 
 AC_CONFIG_AUX_DIR([.])
 AM_INIT_AUTOMAKE([1.10 foreign])

diff --git a/doc/Makefile.am b/doc/Makefile.am
@@ -1,5 +1,5 @@
-EXTRA_DIST = conf.py apiref.rst changes.rst conformance.rst		\
-	gettingstarted.rst github_commits.c index.rst portability.rst	\
+EXTRA_DIST = conf.py apiref.rst changes.rst conformance.rst  \
+	gettingstarted.rst github_commits.c index.rst threadsafety.rst  \
 	tutorial.rst upgrading.rst ext/refcounting.py
 
 SPHINXBUILD = sphinx-build

diff --git a/doc/apiref.rst b/doc/apiref.rst
@@ -114,7 +114,7 @@ also cause errors.
 Type
 ----
 
-.. type:: enum json_type
+.. c:enum:: json_type
 
    The type of a JSON value. The following members are defined:
 
@@ -599,7 +599,7 @@ A JSON array is an ordered collection of other JSON values.
    Iterate over every element of ``array``, running the block
    of code that follows each time with the proper values set to
    variables ``index`` and ``value``, of types :type:`size_t` and
-   :type:`json_t *` respectively. Example::
+   :type:`json_t` pointer respectively. Example::
 
        /* array is a JSON array */
        size_t index;
@@ -781,7 +781,7 @@ allowed in object keys.
    Iterate over every key-value pair of ``object``, running the block
    of code that follows each time with the proper values set to
    variables ``key`` and ``value``, of types ``const char *`` and
-   :type:`json_t *` respectively. Example::
+   :type:`json_t` pointer respectively. Example::
 
        /* obj is a JSON object */
        const char *key;
@@ -1003,7 +1003,7 @@ success. See :ref:`apiref-decoding` for more info.
 All functions also accept *NULL* as the :type:`json_error_t` pointer,
 in which case no error information is returned to the caller.
 
-.. type:: enum json_error_code
+.. c:enum:: json_error_code
 
    An enumeration containing numeric error codes.  The following errors are
    currently defined:

diff --git a/doc/conf.py b/doc/conf.py
@@ -48,7 +48,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.13.1'
+version = '2.14'
 # The full version, including alpha/beta/rc tags.
 release = version
 

diff --git a/doc/threadsafety.rst b/doc/threadsafety.rst
@@ -1,9 +1,9 @@
+.. _thread-safety:
+
 *************
 Thread safety
 *************
 
-.. _thread-safety:
-
 Jansson as a library is thread safe and has no mutable global state.
 The only exceptions are the hash function seed and memory allocation
 functions, see below.

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -25,6 +25,6 @@ libjansson_la_SOURCES = \
 libjansson_la_LDFLAGS = \
 	-no-undefined \
 	-export-symbols-regex '^json_|^jansson_' \
-	-version-info 17:0:13 \
+	-version-info 18:0:14 \
 	@JSON_SYMVER_LDFLAGS@ \
 	@JSON_BSYMBOLIC_LDFLAGS@
diff --git a/src/jansson.h b/src/jansson.h
@@ -21,11 +21,11 @@ extern "C" {
 /* version */
 
 #define JANSSON_MAJOR_VERSION 2
-#define JANSSON_MINOR_VERSION 13
-#define JANSSON_MICRO_VERSION 1
+#define JANSSON_MINOR_VERSION 14
+#define JANSSON_MICRO_VERSION 0
 
 /* Micro version is omitted if it's 0 */
-#define JANSSON_VERSION "2.13.1"
+#define JANSSON_VERSION "2.14"
 
 /* Version as a 3-byte hex number, e.g. 0x010201 == 1.2.1. Use this
    for numeric comparisons, e.g. #if JANSSON_VERSION_HEX >= ... */