organicmaps/jansson
13
Fork 0
mirror of https://github.com/akheron/jansson.git synced 2025-04-10 15:23:27 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions
1050 commits 32 branches 32 tags 3.4 MiB
Commit graph

1050 commits

This branch
This branch
All branches
Author SHA1 Message Date
Petri Lehtinen
1e57cadbd3
Merge pull request #678 from akheron/ditch-coveralls 
Ditch coveralls
 2024-03-07 21:54:05 +02:00
Petri Lehtinen
0db4db1048 Ditch coveralls 2024-03-07 21:47:18 +02:00
Petri Lehtinen
60097f0096
Create SECURITY.md 2023-06-28 07:42:28 +03:00
Petri Lehtinen
bde28463f8
Merge pull request #646 from Bigpet/patch-1 
Remove unused ${SOURCE_DIR}/include include path
 2023-03-29 22:07:32 +03:00
Peter Tissen
e7c9ef8e52
Remove unused ${SOURCE_DIR}/include include path 
The directory `${CMAKE_CURRENT_SOURCE_DIR}/include` is never created or used. Except in case of an in-source build but then  `${CMAKE_CURRENT_BINARY_DIR}/include` would be the same, so it would only duplicate the correct entry.

Not sure if the intermediary `JANSSON__INCLUDE_DIRS` is still necessary but I thought I'd change as little as possible.

The reason for eliminating this is that when you use CLion and sync into a docker container it will try to copy all include dirs back. Non-existant paths cause warnings every time.
 2023-03-29 12:44:28 +02:00
Petri Lehtinen
a22dc95311
Merge pull request #640 from uniontech-lilinjie/master 
fix typo
 2023-01-11 22:25:45 +02:00
lilinjie
a7d04c8554 fix typo 
Signed-off-by: lilinjie <lilinjie@uniontech.com>
 2023-01-10 16:35:44 +08:00
Petri Lehtinen
e23f558007
Merge pull request #628 from neheb/patch-1 
hashtable: change to ifdef
 2022-08-24 17:10:48 +03:00
Rosen Penev
1894366598
hashtable: change to ifdef 
All other usages use ifdef.
 2022-08-22 18:13:57 -07:00
Petri Lehtinen
7e04530916 Remove the confusing vcpkg ad from README 2022-08-09 22:24:38 +03:00
Petri Lehtinen
011e625769
Merge pull request #626 from akheron/fix-example 
Add a missing json_decref in the example
 2022-08-09 22:05:05 +03:00
Petri Lehtinen
de5f2963ab Add a missing json_decref in the example 2022-08-09 22:00:45 +03:00
Petri Lehtinen
128e9c5f37
Merge pull request #610 from Thomas1664/master 
Fix overwriting linker flags
 2022-05-03 05:48:09 +03:00
Thomas Heinrichs
fe6e8eec7e Fix overwriting linker flags 2022-04-28 17:36:54 +02:00
Petri Lehtinen
addeeef408 Add some links to README 2021-11-22 16:30:12 +02:00
Petri Lehtinen
d82b436b2f
Merge pull request #598 from Mephistophiles/remove_internal_strlen 
Reduce strlen's in jansson internals
 2021-11-21 07:38:59 +02:00
Maxim Zhukov
586b4461e6 tests: add some cases in fixed size test 
Signed-off-by: Maxim Zhukov <mussitantesmortem@gmail.com>
 2021-11-20 22:57:10 +03:00
Maxim Zhukov
78418c84f1 value, pack: use key length from json_object iternals 
Reduce the number of strlen calls in the jansson backend.

Test on my laptop (count of the instructions)

  Before:
  ❯ valgrind --tool=callgrind ./bin/test_object
  ==3105045== Events    : Ir
  ==3105045== Collected : 441453

  After:
  ❯ valgrind --tool=callgrind ./bin/test_object
  ==3144451== Events    : Ir
  ==3144451== Collected : 440597

Signed-off-by: Maxim Zhukov <mussitantesmortem@gmail.com>
 2021-11-20 22:47:14 +03:00
Petri Lehtinen
eb81670881
Create CONTRIBUTING.md 2021-09-12 18:37:43 +03:00
Petri Lehtinen
0677666f65 Fix the check-exports tests for versioned symbols 2021-09-09 21:55:27 +03:00
Petri Lehtinen
684e18c927 jansson 2.14 2021-09-09 21:18:40 +03:00
Tomasz Paweł Gajc
e950e57e13 fix --version-script for good 2021-09-06 20:02:14 +03:00
tpgxyz
0dffb4284e use --version-script in case of linkers that does not support --default-symver 2021-04-23 06:41:58 +03:00
Petri Lehtinen
2de2c3d5fc Fix and simplify coveralls reporting 2021-01-26 22:07:32 +02:00
Petri Lehtinen
2cd3126651
Add name to the fuzz tests workflow 2021-01-26 20:03:12 +02:00
Petri Lehtinen
bde3cab216 Fix GitHub actions workflow syntax 2021-01-26 19:33:16 +02:00
Petri Lehtinen
f7aee00928 Use cifuzz actions 2021-01-25 22:20:33 +02:00
Petri Lehtinen
aa52a60ca8 README: Update build badge 2021-01-14 21:12:02 +02:00
Petri Lehtinen
d8aedd3682 Delete Travis CI config 2021-01-14 21:12:02 +02:00
Petri Lehtinen
0441ccd3c6 Also build on Visual Studio 2019 on AppVeyor 2021-01-14 21:12:02 +02:00
Petri Lehtinen
0bc4325222 GitHub Actions 2021-01-14 21:12:02 +02:00
Petri Lehtinen
fd3e9e3051 doc: Hoist a section 2020-11-19 17:31:13 +02:00
Petri Lehtinen
55ea6d44dd doc: Rename "Portability" to "Thread-safety" 
Fixes #545
 2020-11-19 17:27:03 +02:00
Petri Lehtinen
9a0fc069bf
Merge pull request #520 from Mephistophiles/getn 
Add support getn, setn functions
 2020-11-19 17:21:12 +02:00
Petri Lehtinen
cc318fc042
Merge pull request #555 from kiyolee/size_t-warnings 
Fix size_t related MSVC compiler warnings
 2020-11-15 06:32:29 +02:00
Kelvin Lee
638449c43d C11 %zd is bit overkill here. Especially requiring conditional compile. 2020-11-06 15:51:14 +11:00
Kelvin Lee
38c4b80ab7 Fix hashsize() should return size_t. 2020-11-06 08:40:20 +11:00
Kelvin Lee
ec1b6318e4 Use size_t to receive result from fread()/ftell(). 2020-11-05 22:06:38 +11:00
Kelvin Lee
1d8201c656 Print size_t properly with C11 %zd support. 2020-11-05 22:05:54 +11:00
Maxim Zhukov
0758caaac0 reuse key len from loop check for better performance 
Signed-off-by: Maxim Zhukov <mussitantesmortem@gmail.com>
 2020-09-01 10:22:14 +03:00
Maxim Zhukov
16a3899a9e conformance: remove U+0000 restriction for object keys 
Signed-off-by: Maxim Zhukov <mussitantesmortem@gmail.com>
 2020-09-01 10:22:14 +03:00
Maxim Zhukov
ca6775dee4 introduce new fixed-size key API 
This commit added functions working with fixed-size strings (non null-terminated also).
It's helpful for the following cases:
* getting key from substring without copying to separate buffer (better perfomance)
* using pure UTF-8 keys for the objets
* hack: set binary structs as the keys (see test_binary_keys)

added functions:
 * json_object_getn
 * json_object_setn
 * json_object_setn_nocheck
 * json_object_setn_new
 * json_object_setn_new_nocheck
 * json_object_deln
 * json_object_iter_key_len

added iterators:
 * json_object_keylen_foreach
 * json_object_keylen_foreach_safe

Signed-off-by: Maxim Zhukov <mussitantesmortem@gmail.com>
 2020-09-01 10:22:14 +03:00
Maxim Zhukov
ba4503804b pass length of the key to internal API 
Use key length for internal API

Signed-off-by: Maxim Zhukov <mussitantesmortem@gmail.com>
 2020-08-12 09:57:14 +03:00
Maxim Zhukov
966f9cc20a sort tests by alpha order 
Signed-off-by: Maxim Zhukov <mussitantesmortem@gmail.com>
 2020-08-12 09:57:07 +03:00
Petri Lehtinen
a740f15c17
Merge pull request #546 from i-ky/patch-1 
Fix couple of typos
 2020-08-09 10:28:12 +03:00
i-ky
601b568b8d
Fix couple of typos 
"This sections describes" -> "This section describes"
 2020-08-09 00:19:39 +03:00
Petri Lehtinen
1112580f4a
Merge pull request #544 from i-ky/patch-1 
Lift "Depth of nested values" to a higher level
 2020-08-08 20:25:37 +03:00
i-ky
d9c5b1d4df
Lift "Depth of nested values" to a higher level 
Currently this section is under "Numbers" which seems to be wrong.
 2020-08-08 14:10:16 +03:00
Petri Lehtinen
a154389827
Merge pull request #543 from ploxiln/sphinx3 
doc: compatibility with Sphinx-3
 2020-08-08 13:15:23 +03:00
Pierce Lopez
c329fd7bc8 doc: add return types for function-like macros 
The Sphinx-3.0 c:function:: directive requires the return type.

Sphinx-3.0 also adds function-like macro support to the c:macro::
directive, which Sphinx-1.x and Sphinx-2.x do not support, but it
is probably a good idea to keep compatibility with slightly older
Sphinx for now.
 2020-08-07 02:35:27 -04:00