148 Commits (85695f3d5903b1cd5b4030efe50db3b4f5f3c928)

 

All Branches   

Search

Author	SHA1	Message	Date
P4t	85695f3d59	Merge pull request #162 from ghane/Case-Warning ... Add default case for a switch statement to avoid complaints from the compiler.	5 years ago
Sanjeev Gupta	cdcfaafa49	Quieten a warning from the compiler ... gcc (and others) like a default case for switch statement, even if it is empty.	5 years ago
Serge Zaitsev	fdcef3ebf8	Modernize (#149) ... * 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	6 years ago
Serge Zaitsev	18e9fe42cb	Merge pull request #139 from BenBE/patch-1 ... Minor typo in jsmn.c	6 years ago
BenBE	614a36c18c	Typo in comment ... Fixes #84	6 years ago
Serge Zaitsev	732d283ee9	Merge pull request #126 from abalkin/patch-1 ... Fixed two typos in a comment.	7 years ago
Alexander Belopolsky	f38f267b62	Fixed two typos in a comment.	7 years ago
Serge Zaitsev	6784c826d9	Merge pull request #123 from drbitboy/btc/typos ... btc/typos - JSON_ERROR_... should be JSMN_ERROR_... in README.md	7 years ago
Brian Carcich	f276e23a74	btc/typos - JSON_ERROR_... should be JSMN_ERROR_... in README.md	7 years ago
Serge A. Zaitsev	35086597a7	added travis badge	8 years ago
Serge A. Zaitsev	fe296583c0	added travis.yml	8 years ago
Serge Zaitsev	c772a0e48b	Merge pull request #99 from prubel/strict-unmatched-brackets-test-fix ... strict checking fails a test, add {}s to fix it	8 years ago
Paul Rubel	6572217a0e	strict checking fails a test, add {}s to fix it ... 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.	8 years ago
Serge Zaitsev	1682c32e9a	Merge pull request #94 from pt300/master ... Fix for no error with unmatched closing bracket with PARENT_LINKS	8 years ago
Serge Zaitsev	0f574ea35b	Merge pull request #95 from crondaemon/doc-fix ... Fix issue in documentation.	8 years ago
Dario Lombardo	f40811c4de	Fix issue in documentation.	8 years ago
pt300	c3131d05a6	Changed unmatched bracket tests	8 years ago
Pat	adae9457cf	Merge pull request #1 from zlolik/master ... some tests for unmatched brackets added	8 years ago
zlolik	a01d301373	some tests for unmatched brackets added	8 years ago
pt300	4ce4404057	Seems to actually fix zserge/jsmn#81	8 years ago
pt300	ad72aac67a	Partialy fixes zserge/jsmn#81 ... Still will report invalid amount if we fetch it with something like "{"key 1": 1234}}"	8 years ago
Serge Zaitsev	6021415cc7	Merge pull request #87 from RyDroid/make ... Very minor changes to Makefile	8 years ago
Serge Zaitsev	452c926709	Merge pull request #88 from RyDroid/minor-c ... Very minor changes to C source code	8 years ago
Nicola Spanti (RyDroid)	b80578ce08	Very minor changes to Makefile	8 years ago
Nicola Spanti (RyDroid)	e42bcbbada	Very minor changes to C source code	8 years ago
Serge Zaitsev	d1c85c569d	Merge pull request #79 from ferambot/master ... Minor fixes	9 years ago
Feram	37672b0289	Fix typos	9 years ago
Serge Zaitsev	bbc6755fce	Merge pull request #76 from simonsj/master ... tests: fix test_object JSMN_PRIMITIVE bug	9 years ago
Jon Simons	e3f2629a56	tests: fix test_object JSMN_PRIMITIVE bug ... 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`.	9 years ago
Serge Zaitsev	b77d84ba48	Merge pull request #75 from condemned77/master ... Typo fix.	9 years ago
condemned77	76c9448ca8	Typo fix. ... Minor typo fixed.	9 years ago
Serge Zaitsev	572ace5a43	Update README.md	9 years ago
Serge Zaitsev	09843be912	Merge pull request #66 from ivankravets/patch-1 ... @PlatformIO Library Registry manifest file	9 years ago
Ivan Kravets	86d595729c	@PlatformIO Library Registry manifest file ... * 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	9 years ago
Serge Zaitsev	78b1dca334	Merge pull request #65 from Smattr/02ab7ac3-79ee-4541-a80a-230e2ceae1dd ... Fix trivial comment typo.	9 years ago
Matthew Fernandez	b7845b4ea4	Fix trivial comment typo.	9 years ago
Serge Zaitsev	4a54ae6987	Merge pull request #62 from baskerville/master ... Fix deheader warnings	9 years ago
Bastien Dejean	e4d526a403	Fix deheader warnings ... 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	9 years ago
Serge Zaitsev	fdceddf685	Merge pull request #61 from elelay/master ... fix jsmntype_t definition in README	9 years ago
Eric Le Lay	6bfa20872c	fix jsmntype_t definition in README	9 years ago
Serge Zaitsev	8da639a334	Merge pull request #60 from baskerville/master ... Fix typo	9 years ago
Bastien Dejean	f06a10c1b7	Fix typo	9 years ago
Serge A. Zaitsev	076abddc19	fixed privitive value typo in tests	9 years ago
Serge A. Zaitsev	7fb89f1eb2	initialized ok variable in tests, parse should still return 1 if expected result is a failure	9 years ago
Serge A. Zaitsev	8a5ee3d41b	fixed a typo in the test name	9 years ago
Serge Zaitsev	2db03781c5	Merge pull request #55 from goriy/example_realloc_fix ... small fix of jsondump example for cases of realloc failures	9 years ago
goriy	2d185aa465	tiny realloc function wrapper which handles cases of realloc failures ... 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.	9 years ago
goriy	e709651a20	small fix of jsondump example for cases of realloc failures ... 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.	9 years ago
Serge A. Zaitsev	0c2d60b8e7	added and marked as fixme tests for false positives in objects	9 years ago
Serge A. Zaitsev	f7e6dcb7a2	added another test of invalid array	9 years ago