summaryrefslogtreecommitdiff
path: root/json_object.c
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Fix issue #201: add a JSON_C_TO_STRING_NOSLASHESCAPE flag to turn off ↵Eric Haszlakiewicz2015-11-281-3/+9
| |_|/ |/| | | | | | | | escaping of forward slashes.
* | | Fix build in Visual StudioJames Myatt2015-10-091-2/+2
| | |
* | | Merge pull request #196 from rgerhards/improve-performanceEric Haszlakiewicz2015-09-281-28/+76
|\ \ \ | | | | | | | | Performance improvements
| * | | more efficient handling for smalls strings inside json_objectRainer Gerhards2015-09-231-23/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | smalls strings inside json_objects had a high overhead because dynamic memory allocation was needed for each of them. This also meant that the pointer needed to be updated. This is now changed so that small strings can directly be stored inside the json_object. Note that on the regular 64 bit machines a pointer takes 8 bytes. So even without increasing memory, we could store string up to 7 bytes directly inside the object. The max size is configurable. I have selected up to 31 bytes (which means a buffer of 32 including the NUL byte). This brings a 24-bytes memory overhead, but I consider that still useful because the memory allocator usually also has quite some overhead (16 bytes) for dyn alloced memory blocks. In any case, the max buffer size can be tweaked via #define.
| * | | remove unneeded data items from hashtable codeRainer Gerhards2015-09-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These items were used for statistics tracking, but no code at all exists to consume them. By removing them we save a) space because they counters required space, and did so in each and every json object b) performance because calloc() needs to write less data and the counters are no longer maintained; cache performance can be better, load on OS main memory is lighter We could conditionally enable/disable these counters, but I have not done this they were really nowhere used and it looked more like a left-over from the import of hashtable code.
| * | | add json_object_object_add_ex() APIRainer Gerhards2015-09-231-2/+28
| | | | | | | | | | | | | | | | | | | | This provides more control over some detail aspects, many of which are performance related.
| * | | reduce duplicate hash computation in json_object_object_add()Rainer Gerhards2015-09-221-2/+4
| | | | | | | | | | | | | | | | This can be a very considerable performance saver.
* | | | Merge pull request #174 from haata/masterEric Haszlakiewicz2015-05-311-1/+8
|\ \ \ \ | | | | | | | | | | Adding JSON_C_TO_STRING_PRETTY_TAB flag
| * | | | Adding JSON_C_TO_STRING_PRETTY_TAB flagJacob Alexander2015-05-271-1/+8
| | |_|/ | |/| | | | | | | | | | - Tabs are easier to read for tired eyes and editor adjustable
* | | | Use more appropriate castsJames Myatt2015-03-041-3/+3
|/ / /
* | | Slight style tweaks to the bsearch changest.Eric Haszlakiewicz2015-03-041-7/+5
| | |
* | | add bsearch for arraysAlexander Dahl2014-08-211-0/+17
|/ / | | | | | | | | | | 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.
* | Check for failures when allocating memory; return NULL and set errno=ENOMEM ↵Eric Haszlakiewicz2014-04-191-1/+26
| | | | | | | | | | | | in a few of those cases. Thanks to Susant Sahani for pointing out some of these.
* | Reformat some code in json_object.cEric Haszlakiewicz2014-04-191-198/+231
| |
* | Issue#114: check for the presence of isnan and isinf, and provide compat ↵Eric Haszlakiewicz2014-03-021-0/+1
| | | | | | | | macros on MSCV where _isnan and _finite exist instead.
* | Avoid potential overflow in json_object_get_doubleKeith Derrick2013-10-011-1/+32
| | | | | | | | | | | | | | | | | | sscanf is always a potential problem when converting numeric values as it does not correctly handle over- and underflow (or at least gives no indication that it has done so). This change converts json_object_get_double() to use strtod() according to CERT guidelines.
* | Issue #59: change the floating point output format to %.17g so values with ↵Eric Haszlakiewicz2013-09-111-1/+1
| | | | | | | | more than 6 digits show up in the output.
* | Use sizeof instead of hard coded values when calling snprintf.Eric Haszlakiewicz2013-09-111-4/+4
| |
* | Added a json_object_new_double_s() convenience function to allow an exact ↵Eric Haszlakiewicz2013-09-111-5/+30
| | | | | | | | | | | | 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.
* | Merge pull request #96 from rouault/remove_strdnupEric Haszlakiewicz2013-09-081-4/+0
|\ \ | | | | | | Remove redefinition of strndup() which is no longer used in the codebase
| * | Remove redefinition of strndup() which is no longer used in the codebaseEven Rouault2013-08-121-4/+0
| | |
* | | fixing problem that isinf(-Inf) can be 1 or -1Taneli Mielikainen2013-08-041-4/+5
|/ /
* | Merge pull request #89 from ayanes/masterEric Haszlakiewicz2013-06-181-1/+13
|\ \ | | | | | | Support NaN and Infinity
| * | Fixes for Infinity and NaNAdrian Yanes2013-06-121-1/+13
| | | | | | | | | | | | | | | | | | Although JSON RFC does not support NaN or Infinity as numeric values ECMA 262 section 9.8.1 defines how to handle these cases as strings
* | | snprintf definition is needed here, tooAnatol Belski2013-06-041-0/+7
|/ /
* | Merge branch 'remicollet-issue-float'Eric Haszlakiewicz2013-02-261-1/+22
|\ \ | | | | | | | | | | | | Conflicts: json_util.c
| * | probably worth an option for thisRemi Collet2012-12-131-1/+1
| | |
| * | Save space, drop unuseful trailing zeroesRemi Collet2012-12-131-1/+13
| | |
| * | Simple fix to double encodeRemi Collet2012-12-131-1/+10
| | |
* | | add json_object_object_lengthGreg Hazel2013-01-111-0/+5
| |/ |/|
* | escape '\f' in json_escape_strAbioy2012-12-241-0/+2
| | | | | | '\f' is a llegal char and should be escape in printbuf
* | Fix issue #53 - ensure explicit length string are still NUL terminated, and ↵Eric Haszlakiewicz2012-12-091-1/+2
|/ | | | | | | fix json_tokener_parse() to work properly with embedded unicode \u0000 values in strings. Adjust test_null to check for this case. See also http://bugs.debian.org/687269
* Reformat json_object_object_get() and json_object_object_get_ex().Eric Haszlakiewicz2012-10-181-13/+14
|
* Fix json_object_object_get() so it returns NULL if the incoming json_object ↵Eric Haszlakiewicz2012-10-181-1/+4
| | | | is NULL.
* Change json_object_put to return 1 if the object passed was actually freed. ↵Eric Haszlakiewicz2012-10-181-2/+4
| | | | (or 0 if only the reference count was decremented)
* Add a json_set_serializer() function to allow the string output of a ↵Eric Haszlakiewicz2012-09-021-4/+68
| | | | json_object to be customized.
* Rewrite json_object_object_add to replace just the value if the key already ↵Eric Haszlakiewicz2012-07-241-2/+14
| | | | | | | exists so keys remain valid. This is particularly useful when replacing values in a loop, since it allows the key used by json_object_object_foreach to continue to be used.
* Missing explicit casts from void* to specific pointers required. Added ↵Mateusz Loskot2012-05-221-1/+1
| | | | #define strcasecmp for Visual C++.
* Replaced #if HAVE_X with #ifdef HAVE_X as the former test is troublemaker ↵Mateusz Loskot2012-05-211-1/+8
| | | | with #define HAVE_X where #define HAVE_X 1|0 is meant.
* Change the format used for sprintbuf (but not scanf) to use %f instead of ↵Eric Haszlakiewicz2012-04-291-1/+1
| | | | | | %lf because the "l" is unnecessary and some compilers behave differently with it present (e.g. MinGW). Thanks for Mateusz Loskot for the fix.
* Add a json_object_to_json_string_ext() function to allow the formatting of ↵Eric Haszlakiewicz2012-04-281-44/+120
| | | | | | | | | 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.
* Since we already use a local json_bool type, replace any stdbool.h usage withEric Haszlakiewicz2012-04-241-1/+0
| | | | that, since not all environments actually have a stdbool.h to use.
* Add NULL-safe get object methodKeith Derrick2012-04-121-2/+21
| | | | | New json_object_object_get_ex() method protects itself against null pointers and invalid objects being passed in.
* Adjust json_object_is_type and json_object_get_type so they return ↵Eric Haszlakiewicz2012-03-311-0/+4
| | | | json_type_null for NULL objects.
* Rename boolean type to json_boolKeith Derrick2012-03-261-2/+2
| | | | | | | | 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.
* Some updates to make the code compatible with VC 9 (2008)John Arbash Meinel2012-02-011-2/+5
| | | | | VC 9 doesn't support late variable declarations, and doesn't have inttypes so we need some direct definitions of a couple of more types.
* Added capitalized charaters to json_hex_charsFederico Culloca2011-10-301-1/+1
|
* Add new json_object_array_sort functionFrederik Deweerdt2011-10-071-0/+5
| | | | | - uses libc's qsort to sort the arraylist - add test in test1.c
* handle NULL passed to json_objct_object_getJehiah Czebotar2011-05-261-0/+1
| | | | | | | Patch via Nikola Pajkovsky git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@75 327403b1-1117-474d-bef2-5cb71233fd97
* Add a json_type_to_name() function which returns a string that describes the ↵Eric Haszlakiewicz2011-05-031-16/+3
| | | | | | type. Useful for logging. git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@67 327403b1-1117-474d-bef2-5cb71233fd97
View Lorry Controller Status