]> git.feebdaed.xyz Git - 0xmirror/cJSON.git/log
0xmirror/cJSON.git
5 years agoMerge pull request #518 from fpnuseis/master
Alan Wang [Fri, 16 Oct 2020 08:52:10 +0000 (16:52 +0800)]
Merge pull request #518 from fpnuseis/master

fix: windows build failure about defining nan

5 years agofix: windows build failure about defining nan
Use [Thu, 15 Oct 2020 02:52:06 +0000 (11:52 +0900)]
fix: windows build failure about defining nan

5 years agoMerge pull request #505 from Alanscut/release-1.7.14
Alan Wang [Thu, 3 Sep 2020 09:14:26 +0000 (17:14 +0800)]
Merge pull request #505 from Alanscut/release-1.7.14

Release 1.7.14

5 years agoUpdate changelog and contributors
Alanscut [Thu, 3 Sep 2020 09:11:02 +0000 (17:11 +0800)]
Update changelog and contributors

5 years agoUpdate version to 1.7.14
Alanscut [Thu, 3 Sep 2020 09:07:49 +0000 (17:07 +0800)]
Update version to 1.7.14

5 years agoMerge pull request #503 from Alanscut/issue499
Alan Wang [Thu, 3 Sep 2020 03:51:54 +0000 (11:51 +0800)]
Merge pull request #503 from Alanscut/issue499

optimize the way to find tail node

5 years agooptimize the way to find tail node
Alanscut [Wed, 2 Sep 2020 12:23:52 +0000 (20:23 +0800)]
optimize the way to find tail node

5 years agoMerge pull request #502 from Alanscut/nan
Alan Wang [Thu, 27 Aug 2020 12:48:25 +0000 (20:48 +0800)]
Merge pull request #502 from Alanscut/nan

remove float-divide-by-zero for supporting NAN

5 years agoremove float-divide-by-zero for supporting NAN
Alanscut [Thu, 27 Aug 2020 12:46:00 +0000 (20:46 +0800)]
remove float-divide-by-zero for supporting NAN

5 years agoMerge pull request #501 from Alanscut/actions
Alan Wang [Thu, 27 Aug 2020 12:28:06 +0000 (20:28 +0800)]
Merge pull request #501 from Alanscut/actions

add github actions CI

5 years agoadd github actions CI
Alanscut [Thu, 27 Aug 2020 12:26:04 +0000 (20:26 +0800)]
add github actions CI

5 years agoMerge pull request #484 from sappo/master
Alan Wang [Fri, 21 Aug 2020 13:30:19 +0000 (21:30 +0800)]
Merge pull request #484 from sappo/master

Problem: WError error on macosx because NAN is a float

5 years agoMerge pull request #485 from HuKeping/fix-git-archive
Alan Wang [Sat, 27 Jun 2020 08:13:52 +0000 (16:13 +0800)]
Merge pull request #485 from HuKeping/fix-git-archive

Remove unnecessary files in release tarball

5 years agoRemove unnecessary files in release tarball
h00283522 [Fri, 26 Jun 2020 02:37:00 +0000 (10:37 +0800)]
Remove unnecessary files in release tarball

Prior to this patch, we would find '.gitignore', '.travisCI.yml' in
the release tarball.

This patch adds a few entries in .gitattributes to specify files that
should never end up in a distribution tarball.

Signed-off-by: Hu Keping <hukeping@huawei.com>
5 years agoProblem: WError error on macosx because NAN is a float
Kevin Sapper [Tue, 23 Jun 2020 07:16:26 +0000 (09:16 +0200)]
Problem: WError error on macosx because NAN is a float

Solution: Add explicit cast from NAN to double

5 years agofix #376
Alanscut [Mon, 22 Jun 2020 03:23:24 +0000 (11:23 +0800)]
fix #376

5 years agoMerge pull request #472 from Alanscut/parse-array
Alan Wang [Wed, 6 May 2020 09:34:15 +0000 (17:34 +0800)]
Merge pull request #472 from Alanscut/parse-array

array's item should be in the list

5 years agoarray's item should be in the list
Alanscut [Wed, 6 May 2020 09:18:42 +0000 (17:18 +0800)]
array's item should be in the list

5 years agoMerge pull request #456 from miaoerduo/master
Alan Wang [Wed, 6 May 2020 09:07:33 +0000 (17:07 +0800)]
Merge pull request #456 from miaoerduo/master

fix: some bugs in detach and replace, resolved #467

5 years agoMerge pull request #469 from moorthy-bs/master
Alan Wang [Tue, 5 May 2020 03:34:23 +0000 (11:34 +0800)]
Merge pull request #469 from moorthy-bs/master

pkgconfig: cjson include dir added

5 years agoMerge pull request #465 from Summus-git/fix_make_install_config
Alan Wang [Tue, 5 May 2020 03:31:39 +0000 (11:31 +0800)]
Merge pull request #465 from Summus-git/fix_make_install_config

Make install unwanted config files

5 years agopkgconfig: cjson include dir added
Moorthy [Thu, 30 Apr 2020 10:43:44 +0000 (16:13 +0530)]
pkgconfig: cjson include dir added

fixed #468

5 years agoFix make.sh install unwanted config files
Romain Lesteven [Fri, 17 Apr 2020 10:01:39 +0000 (12:01 +0200)]
Fix make.sh install unwanted config files

5 years agofix: errors in replacing the first item when array_size is 1, and replacing the last...
miaoerduo [Fri, 3 Apr 2020 06:47:49 +0000 (14:47 +0800)]
fix: errors in replacing the first item when array_size is 1, and replacing the last item

5 years agofix: error list head's prev when detach the last item
miaoerduo [Fri, 3 Apr 2020 06:07:22 +0000 (14:07 +0800)]
fix: error list head's prev when detach the last item

5 years agofeat: set list head's prev in parse_array and parse_object
miaoerduo [Fri, 3 Apr 2020 03:52:54 +0000 (11:52 +0800)]
feat: set list head's prev in parse_array and parse_object

5 years agoUpdate changelog
Alanscut [Thu, 2 Apr 2020 15:35:50 +0000 (23:35 +0800)]
Update changelog

5 years agoUpdate version to 1.7.13
Alanscut [Thu, 2 Apr 2020 15:34:28 +0000 (23:34 +0800)]
Update version to 1.7.13

5 years agofix error C2124 in visual studio
Alanscut [Thu, 2 Apr 2020 15:32:30 +0000 (23:32 +0800)]
fix error C2124 in visual studio

5 years agoMerge pull request #454 from Alanscut/float-compare
Alan Wang [Thu, 2 Apr 2020 12:09:42 +0000 (20:09 +0800)]
Merge pull request #454 from Alanscut/float-compare

comparing double value with DBL_EPSILON

5 years agoMerge pull request #453 from Alanscut/add-return-value
Alan Wang [Thu, 2 Apr 2020 11:41:56 +0000 (19:41 +0800)]
Merge pull request #453 from Alanscut/add-return-value

add return value for  cJSON_AddItemTo... and cJSON_ReplaceItemxxx

5 years agoMerge pull request #451 from Alanscut/20200324
Alan Wang [Thu, 2 Apr 2020 11:40:03 +0000 (19:40 +0800)]
Merge pull request #451 from Alanscut/20200324

add new function of `cJSON_SetValuestring`

5 years agoAdd getNumberValue function
Sang-Heon Jeon [Thu, 2 Apr 2020 09:06:56 +0000 (18:06 +0900)]
Add getNumberValue function

* Add GetNumberValue function and testcase

Co-authored-by: Alan Wang <wp_scut@163.com>
5 years agoAdded cJSON_ParseWithLength (#358)
caglarivriz [Thu, 2 Apr 2020 08:59:19 +0000 (11:59 +0300)]
Added cJSON_ParseWithLength (#358)

Co-authored-by: Caglar Ivriz <caglar.ivriz@siemens.com>
5 years agoupdate testcase, fixes #433
Alanscut [Thu, 2 Apr 2020 08:24:10 +0000 (16:24 +0800)]
update testcase, fixes #433

5 years agocomparing double value with DBL_EPSILON
Alanscut [Thu, 2 Apr 2020 08:02:24 +0000 (16:02 +0800)]
comparing double value with DBL_EPSILON

5 years agoupdate testcase
Alanscut [Thu, 2 Apr 2020 03:06:47 +0000 (11:06 +0800)]
update testcase

5 years agoadd return value for cJSON_ReplaceItemxxx
Alanscut [Thu, 2 Apr 2020 01:11:36 +0000 (09:11 +0800)]
add return value for cJSON_ReplaceItemxxx

5 years agofalse has been redefined to cJSON_False
Alanscut [Wed, 1 Apr 2020 11:19:00 +0000 (19:19 +0800)]
false has been redefined to cJSON_False

5 years agoadd return value for cJSON_AddItemTo...
Alanscut [Thu, 26 Mar 2020 06:18:52 +0000 (14:18 +0800)]
add return value for  cJSON_AddItemTo...

5 years agoupdate cJSON_SetValuestring and testcase
Alanscut [Wed, 25 Mar 2020 07:38:54 +0000 (15:38 +0800)]
update cJSON_SetValuestring and testcase

5 years agoupdate README
Alanscut [Tue, 24 Mar 2020 14:28:35 +0000 (22:28 +0800)]
update README

5 years agoadd testcase for cJSON_SetValuestringToObject
Alanscut [Tue, 24 Mar 2020 14:28:27 +0000 (22:28 +0800)]
add testcase for cJSON_SetValuestringToObject

5 years agoadd new function of setValuestringToObject
Alanscut [Tue, 24 Mar 2020 14:28:15 +0000 (22:28 +0800)]
add new function of setValuestringToObject

5 years agoImprove performance of adding item to array (#448)
Alan Wang [Tue, 24 Mar 2020 08:17:25 +0000 (16:17 +0800)]
Improve performance of adding item to array (#448)

* use prev pointer when adding item to array

Co-authored-by: xiaomianhehe <hongshaokai@hotmail.com>
Co-authored-by: Alanscut <scut@163.com>
Date:   Tue Feb 18 11:54:23 2020 +0800

* add testcase for cJSON_DeleteItemFromArray

5 years agoupdate contributors
Alanscut [Thu, 19 Mar 2020 14:58:04 +0000 (22:58 +0800)]
update contributors

5 years agoMerge pull request #447 from Alanscut/fix_encode_string_as_pointer
Alan Wang [Wed, 18 Mar 2020 08:53:52 +0000 (16:53 +0800)]
Merge pull request #447 from Alanscut/fix_encode_string_as_pointer

Fix encode_string_as_pointer

5 years agofix encode_string_as_pointer
Alanscut [Wed, 18 Mar 2020 08:04:58 +0000 (16:04 +0800)]
fix encode_string_as_pointer

5 years agoMerge pull request #440 from Square789/patch-1
Alan Wang [Mon, 16 Mar 2020 15:12:14 +0000 (23:12 +0800)]
Merge pull request #440 from Square789/patch-1

updating doc

5 years agoMerge pull request #446 from DaveGamble/revert-430-array_add
Alan Wang [Mon, 16 Mar 2020 15:08:06 +0000 (23:08 +0800)]
Merge pull request #446 from DaveGamble/revert-430-array_add

Revert "use prev pointer when array do adding"

5 years agoRevert "use prev pointer when array do adding (#430)"
Alan Wang [Mon, 16 Mar 2020 15:04:39 +0000 (23:04 +0800)]
Revert "use prev pointer when array do adding (#430)"

This reverts commit e8077d01500279a7b45b8cd7a0ae94ea7ad5748a.

5 years agoSpelling; "it's"->"its"
Square789 [Mon, 9 Mar 2020 12:40:08 +0000 (13:40 +0100)]
Spelling; "it's"->"its"

5 years agouse prev pointer when array do adding (#430)
xiaomianhehe [Tue, 18 Feb 2020 03:54:23 +0000 (11:54 +0800)]
use prev pointer when array do adding (#430)

* use prev pointer when array do adding

5 years agoMerge pull request #431 from DevGim/dev
Alan Wang [Tue, 11 Feb 2020 06:18:50 +0000 (14:18 +0800)]
Merge pull request #431 from DevGim/dev

formatting README.md

5 years agoformatting README.md
dm8.kim [Tue, 11 Feb 2020 04:25:02 +0000 (13:25 +0900)]
formatting README.md

5 years agoupdate content in README
Alanscut [Sun, 19 Jan 2020 07:23:48 +0000 (15:23 +0800)]
update content in README

5 years agoMerge pull request #425 from NancyLi1013/vcpkg-instructions
Alan Wang [Sun, 19 Jan 2020 07:10:54 +0000 (15:10 +0800)]
Merge pull request #425 from NancyLi1013/vcpkg-instructions

Add vcpkg installation instructions

5 years agoUpdate changes
NancyLi1013 [Sun, 19 Jan 2020 07:08:01 +0000 (23:08 -0800)]
Update changes

5 years agoAdd vcpkg installation instructions
NancyLi1013 [Sun, 19 Jan 2020 06:47:13 +0000 (22:47 -0800)]
Add vcpkg installation instructions

5 years agoremove annoying float-equal option
Alanscut [Sat, 18 Jan 2020 15:02:55 +0000 (23:02 +0800)]
remove annoying float-equal option

5 years agocorrect mistake
Alanscut [Thu, 16 Jan 2020 09:10:52 +0000 (17:10 +0800)]
correct mistake

6 years agoMerge pull request #418 from Alanscut/update_Changelog
Alanscut [Tue, 10 Dec 2019 09:38:45 +0000 (17:38 +0800)]
Merge pull request #418 from Alanscut/update_Changelog

update CHANGELOG

6 years agoupdate CHANGELOG.md
Alanscut [Fri, 29 Nov 2019 08:10:41 +0000 (16:10 +0800)]
update CHANGELOG.md

6 years agoimprove compare_double
Alanscut [Mon, 9 Dec 2019 02:36:45 +0000 (10:36 +0800)]
improve compare_double

6 years agoMerge pull request #417 from zjuchenyuan/patch-1
Alanscut [Mon, 9 Dec 2019 00:54:55 +0000 (08:54 +0800)]
Merge pull request #417 from zjuchenyuan/patch-1

Update cJSON_Utils.c to avoid ‘CJSON_DOUBLE_PRECIION’ undeclared

6 years agoUpdate cJSON_Utils.c
ChenYuan [Sat, 7 Dec 2019 12:24:07 +0000 (20:24 +0800)]
Update cJSON_Utils.c

fix typo

6 years agoimprove compare_double function
Alanscut [Fri, 6 Dec 2019 10:16:27 +0000 (18:16 +0800)]
improve compare_double function

6 years agofix double comparison
Alanscut [Fri, 6 Dec 2019 09:11:12 +0000 (17:11 +0800)]
fix double comparison

6 years agorevert R_CFLAGS
Alanscut [Fri, 6 Dec 2019 07:32:45 +0000 (15:32 +0800)]
revert R_CFLAGS

6 years agoMerge pull request #368 from paulmalovanyi/master
Alanscut [Fri, 6 Dec 2019 07:18:55 +0000 (15:18 +0800)]
Merge pull request #368 from paulmalovanyi/master

Fix clang -Wfloat-equal warning

6 years agoMerge branch 'master' into master
Alanscut [Fri, 6 Dec 2019 07:14:26 +0000 (15:14 +0800)]
Merge branch 'master' into master

6 years agoMerge pull request #412 from Alanscut/fix_issue_327
Alanscut [Fri, 6 Dec 2019 06:43:58 +0000 (14:43 +0800)]
Merge pull request #412 from Alanscut/fix_issue_327

fix issue#327

6 years agoMerge pull request #415 from Alanscut/fix_issue_414
Alanscut [Thu, 5 Dec 2019 03:13:20 +0000 (11:13 +0800)]
Merge pull request #415 from Alanscut/fix_issue_414

fix memory leak mentioned in issue 414

6 years agofix memory leak mentioned in issue 414
Alanscut [Thu, 5 Dec 2019 03:05:07 +0000 (11:05 +0800)]
fix memory leak mentioned in issue 414

6 years agoMerge pull request #413 from erez-o/master
Alanscut [Fri, 29 Nov 2019 03:04:49 +0000 (11:04 +0800)]
Merge pull request #413 from erez-o/master

Added blank lines in Readme.md

6 years agoAdded blank lines in Readme.md
Erez Oxman [Thu, 28 Nov 2019 12:15:44 +0000 (14:15 +0200)]
Added blank lines in Readme.md

Added blank lines before list items and headings. This change creates consistency between different markdown parsers. There's no difference in the output of Github flavored markdown.

See https://babelmark.github.io/

6 years agofix issue#327
Alanscut [Wed, 27 Nov 2019 03:08:35 +0000 (11:08 +0800)]
fix issue#327

6 years agoMerge pull request #408 from rolegic/patch-api-h-c
Alanscut [Tue, 19 Nov 2019 02:51:13 +0000 (10:51 +0800)]
Merge pull request #408 from rolegic/patch-api-h-c

Fixed different argument between declaration and definition

6 years agoFixed different argument between declaration and definition
rolegic [Fri, 15 Nov 2019 14:43:43 +0000 (15:43 +0100)]
Fixed different argument between declaration and definition

6 years agoMerge pull request #405 from Alanscut/issue-404
Alanscut [Sat, 2 Nov 2019 14:38:33 +0000 (22:38 +0800)]
Merge pull request #405 from Alanscut/issue-404

fix make failed in mac os

6 years agofix make failed in mac os
Alanscut [Fri, 1 Nov 2019 03:30:14 +0000 (11:30 +0800)]
fix make failed in mac os

6 years agoupdate readme
Alanscut [Tue, 29 Oct 2019 08:14:22 +0000 (16:14 +0800)]
update readme

6 years agoMerge pull request #402 from Alanscut/cmake_add_uninstall_target
Alanscut [Tue, 29 Oct 2019 08:09:32 +0000 (16:09 +0800)]
Merge pull request #402 from Alanscut/cmake_add_uninstall_target

CMake: add uninstall target

6 years agoadd uninstall target in cmake
Alanscut [Tue, 29 Oct 2019 07:48:11 +0000 (15:48 +0800)]
add uninstall target in cmake

6 years agofix rmdir error (#401)
Alanscut [Tue, 29 Oct 2019 06:21:16 +0000 (14:21 +0800)]
fix rmdir error (#401)

* fix rmdir error

6 years agoadd new line to endif
Alanscut [Tue, 29 Oct 2019 04:47:36 +0000 (12:47 +0800)]
add new line to endif

6 years agoMerge pull request #400 from randy408/fuzz
Alanscut [Tue, 22 Oct 2019 13:07:52 +0000 (21:07 +0800)]
Merge pull request #400 from randy408/fuzz

OSS-Fuzz: build with $CXX

6 years agoossfuzz: build with c++ compiler
Randy [Tue, 22 Oct 2019 11:37:41 +0000 (13:37 +0200)]
ossfuzz: build with c++ compiler

6 years agofuzz: add support for compiling with c++ compiler
Randy [Tue, 22 Oct 2019 11:32:41 +0000 (13:32 +0200)]
fuzz: add support for compiling with c++ compiler

6 years agoMerge pull request #398 from randy408/fuzz
Alanscut [Tue, 22 Oct 2019 10:48:47 +0000 (18:48 +0800)]
Merge pull request #398 from randy408/fuzz

ossfuzz.sh: fix permission bits

6 years agoossfuzz.sh: fix permission bits
Randy [Tue, 22 Oct 2019 10:45:13 +0000 (12:45 +0200)]
ossfuzz.sh: fix permission bits

6 years agoMerge pull request #378 from randy408/fuzz
Alanscut [Tue, 22 Oct 2019 03:22:30 +0000 (11:22 +0800)]
Merge pull request #378 from randy408/fuzz

Add libFuzzer fuzz target / OSS-Fuzz integration

6 years agoconvert fuzz target to c89, optimize
randy408 [Mon, 21 Oct 2019 13:27:47 +0000 (15:27 +0200)]
convert fuzz target to c89, optimize

6 years agoMerge pull request #351 from GitMensch/patch-1
Alanscut [Mon, 21 Oct 2019 09:06:14 +0000 (17:06 +0800)]
Merge pull request #351 from GitMensch/patch-1

allow to override PIC_FLAGS and compiler std

6 years agoMerge pull request #377 from Alanscut/20190628
Alanscut [Sun, 20 Oct 2019 14:47:11 +0000 (22:47 +0800)]
Merge pull request #377 from Alanscut/20190628

fix bug: add const to the parameter in the cJSON_GetStringValue function

6 years agoMerge pull request #395 from bjda/more_const
Alanscut [Sun, 20 Oct 2019 14:46:05 +0000 (22:46 +0800)]
Merge pull request #395 from bjda/more_const

Add const qualifier to cJSON_CreateStringArray

6 years agoMerge pull request #343 from myd7349/fix-install-path
Alanscut [Sat, 19 Oct 2019 14:57:48 +0000 (22:57 +0800)]
Merge pull request #343 from myd7349/fix-install-path

CMake: Improve install target

6 years agoMerge pull request #396 from julian-st/master
Alanscut [Sat, 19 Oct 2019 14:23:45 +0000 (22:23 +0800)]
Merge pull request #396 from julian-st/master

initialize variables in print_number

6 years agoinitilize variables in print_number
Julian Ste [Sat, 19 Oct 2019 11:53:21 +0000 (13:53 +0200)]
initilize variables in print_number

6 years agoAdd const qualifier to cJSON_CreateStringArray
Bernt Johan Damslora [Thu, 17 Oct 2019 12:03:15 +0000 (14:03 +0200)]
Add const qualifier to cJSON_CreateStringArray

Adds a const qualifier to the strings in the array to avoid discarding
it from arguments.