aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Typo in commentBenBE2018-10-01
| | | Fixes #84
* Merge pull request #126 from abalkin/patch-1Serge Zaitsev2018-02-12
|\ | | | | Fixed two typos in a comment.
| * Fixed two typos in a comment.Alexander Belopolsky2018-02-10
|/
* Merge pull request #123 from drbitboy/btc/typosSerge Zaitsev2018-01-25
|\ | | | | btc/typos - JSON_ERROR_... should be JSMN_ERROR_... in README.md
| * btc/typos - JSON_ERROR_... should be JSMN_ERROR_... in README.mdBrian Carcich2018-01-25
|/
* added travis badgeSerge A. Zaitsev2017-05-01
|
* added travis.ymlSerge A. Zaitsev2017-05-01
|
* Merge pull request #99 from prubel/strict-unmatched-brackets-test-fixSerge Zaitsev2017-04-30
|\ | | | | strict checking fails a test, add {}s to fix it
| * strict checking fails a test, add {}s to fix itPaul Rubel2016-12-13
|/ | | | | | | The current test looks for success, but since there are no surrounding {}s the test fails. Add them in and add a test like the one that we replace but only in the non-strict code path.
* Merge pull request #94 from pt300/masterSerge Zaitsev2016-10-12
|\ | | | | Fix for no error with unmatched closing bracket with PARENT_LINKS
| * Changed unmatched bracket testspt3002016-10-02
| |
| * Merge pull request #1 from zlolik/masterPat2016-10-02
| |\ | | | | | | some tests for unmatched brackets added
| | * some tests for unmatched brackets addedzlolik2016-10-02
| |/
| * Seems to actually fix zserge/jsmn#81pt3002016-10-01
| |
| * Partialy fixes zserge/jsmn#81pt3002016-10-01
| | | | | | | | Still will report invalid amount if we fetch it with something like "{"key 1": 1234}}"
* | Merge pull request #95 from crondaemon/doc-fixSerge Zaitsev2016-10-06
|\ \ | |/ |/| Fix issue in documentation.
| * Fix issue in documentation.Dario Lombardo2016-10-06
|/
* Merge pull request #87 from RyDroid/makeSerge Zaitsev2016-08-10
|\ | | | | Very minor changes to Makefile
| * Very minor changes to MakefileNicola Spanti (RyDroid)2016-08-08
| |
* | Merge pull request #88 from RyDroid/minor-cSerge Zaitsev2016-08-10
|\ \ | |/ |/| Very minor changes to C source code
| * Very minor changes to C source codeNicola Spanti (RyDroid)2016-08-08
|/
* 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
|
Powered by cgit, Themed by Ted Yin.