Jan-Philipp Litza
2200ffa8b0
Fix code in docs for json_object_new_double_s()
9 years ago
Eric Haszlakiewicz
1fb87cd196
Merge branch 'master' of https://github.com/Protovision/json-c into Protovision-master
9 years ago
Eric Haszlakiewicz
4e0c8b55fb
Merge pull request #220 from hschaa/master
Add utility function for comparing json_objects
9 years ago
Mina Naguib
138c2a6b97
Clarify json_object_get_string documentation of NULL handling & returning
9 years ago
Helmut Schaa
00e475c434
Add utility function for comparing json_objects
9 years ago
Eric Haszlakiewicz
537f8bcbdb
Add const qualifiers to several functions that don't modify the json_object.
9 years ago
Eric Haszlakiewicz
980cdd61be
Merge commit '2be921d88376e78f84d79aafa6db2714da804e59'
9 years ago
Eric Haszlakiewicz
316da85818
Fix issue #201 : add a JSON_C_TO_STRING_NOSLASHESCAPE flag to turn off escaping of forward slashes.
9 years ago
Daniel M. Weeks
92e9a5032b
Use size_t for json object array ops
11 years ago
Eric Haszlakiewicz
12916e229c
Merge pull request #196 from rgerhards/improve-performance
Performance improvements
10 years ago
Rainer Gerhards
2d549662be
add json_object_object_add_ex() API
This provides more control over some detail aspects, many
of which are performance related.
10 years ago
Eric Haszlakiewicz
1757a31750
Fix doc for json_object_new_boolean() to indicate the correct value for TRUE (1).
10 years ago
Eric Haszlakiewicz
93b1fe63e5
Add back in the __attribute__((__unused__)) that was lost in the previous commit.
It's needed to squash a "variable 'val' set but not used" warning.
10 years ago
Eric Haszlakiewicz
a8bbefbbb4
Merge pull request #183 from cryogen/master
Apply compile warning fix to master branch
10 years ago
Jacob Alexander
92d4cf15f0
Adding JSON_C_TO_STRING_PRETTY_TAB flag
- Tabs are easier to read for tired eyes and editor adjustable
10 years ago
Stuart Walsh
75d7409c4e
Fix uninitialised variable compile warning, and also fix unused-when-used warning
10 years ago
Mark Swoope
cdca9d3c8e
Added array_list_del_idx and json_object_array_del_idx
10 years ago
Eric Haszlakiewicz
484ca368f0
Slight style tweaks to the bsearch changest.
10 years ago
Eric Haszlakiewicz
a500c1f0b5
Merge pull request #155 from LeSpocky/bsearch
add bsearch for arrays
10 years ago
Eric Haszlakiewicz
9db3099572
Merge pull request #156 from jubalh/master
Remove trailing whitespaces
10 years ago
Eric Haszlakiewicz
ec4879ac5b
Merge pull request #153 from LeSpocky/doc
improve doc for json_object_to_json_string()
11 years ago
Michael Vetter
fcf5ad1bd6
Remove trailing whitespace
11 years ago
Alexander Dahl
2f5789bdef
add bsearch for arrays
Arrays can already be sorted with json_object_array_sort() which uses
qsort() of the standard C library. This adds a counterpart using the
bsearch() from C.
11 years ago
Alexander Dahl
37f5d8696d
improve doc for json_object_to_json_string()
11 years ago
Michael J. Chinn
048dcf288a
Remove json_type enum trailing comma
11 years ago
Michael Clark
64e36901a0
Patch to address the following issues:
* CVE-2013-6371: hash collision denial of service
* CVE-2013-6370: buffer overflow if size_t is larger than int
11 years ago
Eric Haszlakiewicz
51993c28c2
Added a json_object_new_double_s() convenience function to allow an exact string representation of a double to be specified when creating the object and use it in json_tokener_parse_ex() so a re-serialized object more exactly matches the input.
Add json_object_free_userdata() and json_object_userdata_to_json_string() too.
12 years ago
Even Rouault
6c4bb3840c
Add extern to json_object_set_serializer so that it gets exported (Windows fix)
12 years ago
Greg Hazel
88bf1c9960
one definition of json_object_object_foreach only works on c99 and later
12 years ago
Eric Haszlakiewicz
5b36a432c8
Merge branch 'remicollet-issue-float'
Conflicts:
json_util.c
12 years ago
Eric Haszlakiewicz
9b64c05ff9
Mark the "val" variable in json_object_object_foreach as unused so the compiler doesn't complain. Fix warnings in the testReplaceExisting test.
12 years ago
Eric Haszlakiewicz
92d289f5d3
Add a comment briefly describing json_object_object_length()
12 years ago
Greg Hazel
cca74c6de6
add json_object_object_length
12 years ago
Alexander Klauer
2be921d883
Fixed json_object_object_add().
* Return value of json_object_object_add() changed from void to int.
Return value now indicates success or failure.
* Check whether allocations are successful.
* Do not exit program from within the library.
12 years ago
Alexander Klauer
beb12d49e1
Make macro json_object_object_foreach multiple-use safe
12 years ago
Remi Collet
32d149c8f6
probably worth an option for this
12 years ago
Eric Haszlakiewicz
f6b27cbb6c
Make it safe to delete keys while iterating with the json_object_object_foreach macro.
13 years ago
Eric Haszlakiewicz
5abc0ea444
Reformat the json_object_object_foreach macro so it is readable, and document what is allowed to be done with the object while iterating.
13 years ago
Eric Haszlakiewicz
5f4739e2eb
Change json_object_put to return 1 if the object passed was actually freed. (or 0 if only the reference count was decremented)
13 years ago
Eric Haszlakiewicz
38f421a2e7
Add a json_set_serializer() function to allow the string output of a json_object to be customized.
13 years ago
Eric Haszlakiewicz
3fcffe1bb0
Add a json_object_to_json_string_ext() function to allow the formatting of output to be selected.
There are now three options: JSON_C_TO_STRING_SPACED, JSON_C_TO_STRING_PLAIN and JSON_C_TO_STRING_PRETTY.
This also add a json_object_to_file_ext() that takes the same flags.
Existing output of json_object_to_json_string() is unchanged, and uses JSON_C_TO_STRING_SPACED.
Thanks fo Grant Edwards for the initial patches.
13 years ago
Keith Derrick
6917586acf
Add NULL-safe get object method
New json_object_object_get_ex() method protects itself against null pointers
and invalid objects being passed in.
13 years ago
Keith Derrick
ca519fb817
Added explanatory notes to documentation.
13 years ago
Eric Haszlakiewicz
6ff0817bac
Mention json_type_to_name() in the docs for json_object_get_type().
13 years ago
Eric Haszlakiewicz
aef439a175
Adjust json_object_is_type and json_object_get_type so they return json_type_null for NULL objects.
13 years ago
Keith Derrick
37e7467476
Rename boolean type to json_bool
In building large systems, there are often clashes over the
preferred base type to use for bool/boolean. At least one
experience has been with a 3rd party proprietary library which
can not be changed. In that case, boolean was a synonym for
unsigned char and used widely in packed structures.
13 years ago
Eric Haszlakiewicz
b21b137805
Include json_inttypes.h in json_object.h since we use types like int32_t in the API and some systems need that header to compile.
As part of this create a public json_config.h with a custom define to
decide whether to include inttypes.h to avoid conflicting with other
projects config.h header.
13 years ago
Frederik Deweerdt
c43871c866
Add new json_object_array_sort function
- uses libc's qsort to sort the arraylist
- add test in test1.c
14 years ago
Jehiah Czebotar
43d2f417c7
move definition of json_object_iter to public header to enable external use of json_object_object_foreachC
Patch from Rick Moran <https://github.com/DrHayt >
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@74 327403b1-1117-474d-bef2-5cb71233fd97
14 years ago
Eric Haszlakiewicz
886c4fbebf
Add a json_type_to_name() function which returns a string that describes the type. Useful for logging.
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@67 327403b1-1117-474d-bef2-5cb71233fd97
14 years ago