aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Squashed 'dependencies/jsmn/' changes from 053d3cd..1aa2e8fToni Uhlig2021-09-15
| | | | | | | | | 1aa2e8f Update README.md (#203) b85f161 Update README.md (#213) 23f13d2 Merge pull request #108 from olmokramer/patch-1 git-subtree-dir: dependencies/jsmn git-subtree-split: 1aa2e8f80849c983466b165d53542da9b1bd1b32
* Merge pull request #175 from pks-t/pks/struct-typeP4t2020-04-02
|\ | | | | jsmn: declare struct names to allow forward decls
| * jsmn: declare struct names to allow forward declsPatrick Steinhardt2019-11-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both `jsmntok_t` and `jsmn_parser` are declared as anonymous structures that are typedeffed to their actual name. This forces all downstream users of jsmn to always use the typedef name, instead of using e.g. `struct jsmn_parser`. While this might be considered a matter of taste, using typedefs only has the technical downside of disallowing forward declarations. E.g. if a dependent whishes to declare a pointer to `jsmntok_t` without actually pulling in the "jsmn.h" header, then he is not able to do so because there is no way in C to provide a forward declaration for typedefs to anonymous structs. Fix this by providing names for both `jsmntok_t` and `jsmn_parser` structures.
* | fix gcc/clang warning and unnecessary implicit type conversion to different ↵Toni Uhlig2020-03-13
| | | | | | | | | | | | | | | | | | size/signedness (#187) * fixed gcc/clang warnings regarding implicit numeric to enum type conversion * fixed unnecessary implicit type casts regarding size and signedness Co-authored-by: Toni Uhlig <Toni.Uhlig@rohde-schwarz.com>
* | Fixed a typo (value -> number) (#186)Alexey Radkov2020-02-19
|/
* Merge pull request #162 from ghane/Case-WarningP4t2019-07-14
|\ | | | | Add default case for a switch statement to avoid complaints from the compiler.
| * Quieten a warning from the compilerSanjeev Gupta2019-07-13
|/ | | | | gcc (and others) like a default case for switch statement, even if it is empty.
* Modernize (#149)Serge Zaitsev2019-04-20
| | | | | | | | | | | | | | | * add .clang-format for automated code formatting * automatic code formatting * move config.mk below all target to allow custom non-default build targets * add license to the top of the file * use correct header file guards syntax * convert to single-header, header-only library * update makefile to use jsmn as a header-only library * update readme * add changed from PR #143 * fix clang warnings * add changes from PR #142 * add consts as per PR #134
* Merge pull request #139 from BenBE/patch-1Serge Zaitsev2018-10-02
|\ | | | | Minor typo in jsmn.c
| * 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
|
Powered by cgit, Themed by Ted Yin.