aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| * Merge pull request #79 from ferambot/masterSerge Zaitsev2016-06-13
| |\ | | | | | | Minor fixes
| | * Fix typosFeram2016-06-13
| |/
| * Merge pull request #76 from simonsj/masterSerge Zaitsev2016-04-02
| |\ | | | | | | tests: fix test_object JSMN_PRIMITIVE bug
| | * tests: fix test_object JSMN_PRIMITIVE bugJon Simons2016-04-01
| |/ | | | | | | | | | | Specify the argument after JSMN_PRIMITIVE as "0" instead of 0 so that weird things don't happen on OSX due to using it later with `va_arg(..., char *)` in `vtokeq`.
| * Merge pull request #75 from condemned77/masterSerge Zaitsev2016-03-28
| |\ | | | | | | Typo fix.
| | * Typo fix.condemned772016-03-28
| |/ | | | | Minor typo fixed.
| * Update README.mdSerge Zaitsev2016-01-20
| |
| * Merge pull request #66 from ivankravets/patch-1Serge Zaitsev2016-01-19
| |\ | | | | | | @PlatformIO Library Registry manifest file
| | * @PlatformIO Library Registry manifest fileIvan Kravets2016-01-19
| |/ | | | | | | | | * This library in Web Registry: http://platformio.org/#!/lib/show/568/jsmn * Specification: [library.json](http://docs.platformio.org/en/latest/librarymanager/config.html) * Library Manager: http://docs.platformio.org/en/latest/librarymanager/index.html
| * Merge pull request #65 from Smattr/02ab7ac3-79ee-4541-a80a-230e2ceae1ddSerge Zaitsev2016-01-13
| |\ | | | | | | Fix trivial comment typo.
| | * Fix trivial comment typo.Matthew Fernandez2016-01-13
| |/
| * Merge pull request #62 from baskerville/masterSerge Zaitsev2015-12-14
| |\ | | | | | | Fix deheader warnings
| | * Fix deheader warningsBastien Dejean2015-12-14
| |/ | | | | | | | | | | | | | | Prior to this commit the output of deheader was: remove <stdlib.h> from ./jsmn.c in ./example/jsondump.c, realloc() portability requires <unistd.h>. in ./example/simple.c, strtol() portability requires <stdlib.h>. saw 4 files, 16 includes, 1 removable
| * Merge pull request #61 from elelay/masterSerge Zaitsev2015-12-08
| |\ | | | | | | fix jsmntype_t definition in README
| | * fix jsmntype_t definition in READMEEric Le Lay2015-12-07
| |/
| * Merge pull request #60 from baskerville/masterSerge Zaitsev2015-11-19
| |\ | | | | | | Fix typo
| | * Fix typoBastien Dejean2015-11-19
| |/
| * fixed privitive value typo in testsSerge A. Zaitsev2015-10-31
| |
| * initialized ok variable in tests, parse should still return 1 if expected ↵Serge A. Zaitsev2015-10-31
| | | | | | | | result is a failure
| * fixed a typo in the test nameSerge A. Zaitsev2015-10-31
| |
| * Merge pull request #55 from goriy/example_realloc_fixSerge Zaitsev2015-10-25
| |\ | | | | | | small fix of jsondump example for cases of realloc failures
| | * tiny realloc function wrapper which handles cases of realloc failuresgoriy2015-10-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | Memory reallocation with old data pointer handling is done by means of realloc_it() function. Tiny inline function realloc_it() is a wrapper function for standart realloc() which frees old memory pointer and prints errno to stderr if realloc fails.
| | * small fix of jsondump example for cases of realloc failuresgoriy2015-10-24
| |/ | | | | | | | | | | | | | | | | | | | | When realloc() function fails it returns NULL pointer. But old data pointer remains valid in such a case. It's a mistake to use old data pointer to store new pointer returned by realloc. In case of realloc failure, pointer is overwritten with NULL value, but old used memory remains unreferenced and could not be even freed anymore. Such mistakes could lead to memory leaks.
| * added and marked as fixme tests for false positives in objectsSerge A. Zaitsev2015-10-17
| |
| * added another test of invalid arraySerge A. Zaitsev2015-10-17
| |
| * added another test of invalid arraySerge A. Zaitsev2015-10-17
| |
| * added check for null pointer before fixing tokens after parsing is doneSerge A. Zaitsev2015-10-17
| |
| * applied fix from wiresharkSerge A. Zaitsev2015-10-17
| |
| * changed jsmnerr_t type to intSerge A. Zaitsev2015-10-17
| |
| * added issue 27 test caseSerge A. Zaitsev2015-10-17
| |
| * fixed return value on incremental partingSerge A. Zaitsev2015-10-17
| |
| * moved tests into a subfolder, added table-driven testsSerge A. Zaitsev2015-10-17
| |
| * json token type enum doesn't start with zero value anymore, fixes #24Serge A. Zaitsev2015-10-17
| |
| * removed mixed declarations and code, fixes #45Serge A. Zaitsev2015-10-17
| |
| * changed test function args to void, fixes #46Serge A. Zaitsev2015-10-17
| |
| * test exit status depends on number of failed testsSerge A. Zaitsev2015-10-17
| |
| * Changed links to githubSerge Zaitsev2015-09-24
| |
| * updated READMESerge A. Zaitsev2014-12-19
| |
| * added js string boundaries checks for string parser, fixes issue #31; added ↵Serge A. Zaitsev2014-11-17
| | | | | | | | tests to cover it; fixed makefile to use custom cflags/ldflags
| * added some tests for key/values nodes and added some stricter validationsSerge A. Zaitsev2014-11-17
| |
| * moved i declaration to the top of the block, issue #38 fixedSerge A. Zaitsev2014-11-17
| |
| * including stddef.h in the jsmn.h, fixed issue #28Serge A. Zaitsev2014-11-17
| |
| * removed trailing spacesSerge A. Zaitsev2014-11-17
| |
| * implemented key/value hierarchy; added 2 examples; fixed some warnings in testsSerge A. Zaitsev2014-11-17
| |
| * Merged in ↵Serge Zaitsev2014-10-09
| |\ | | | | | | | | | | | | | | | setekhid/jsmn/setekhid/jsmnh2822-warning-commas-at-the-end-of-e-1408807731663 (pull request #11) jsmn.h:28:22: warning: commas at the end of enumerator lists are a C99-specific feature [-Wc99-extensions]
| | * jsmn.h:28:22: warning: commas at the end of enumerator lists are a ↵Wizard Tai2014-08-23
| |/ | | | | | | | | | | | | | | C99-specific feature [-Wc99-extensions] WITH: -std=c89 -Wall -pedantic -Wno-declaration-after-statement
| * removed JSMN_SUCCESS value from the readmeSerge A. Zaitsev2014-02-21
| |
| * Merged in MacGritsch/jsmn-patch (pull request #7)Serge Zaitsev2014-02-21
| |\ | | | | | | | | | Added "extern C" to use it with CPP.
| | * Added "extern C" to use it with CPP.Gabriel Gritsch2014-02-21
| | |
| | * Integrate changes made by Serge Zaitsev.Gabriel Gritsch2014-02-21
| | |