platform/upstream/json-c.git
6 years agoChange package name ( libjosn -> libjson4 ) 40/176140/1 accepted/tizen_5.0_unified accepted/tizen_5.5_unified accepted/tizen_5.5_unified_mobile_hotfix accepted/tizen_5.5_unified_wearable_hotfix accepted/tizen_6.0_unified_hotfix sandbox/backup/json-c_0.13.1_20201109 tizen_5.0 tizen_5.5 tizen_5.5_mobile_hotfix tizen_5.5_tv tizen_5.5_wearable_hotfix tizen_6.0_hotfix accepted/tizen/5.0/unified/20181102.025241 accepted/tizen/5.5/unified/20191031.012040 accepted/tizen/5.5/unified/mobile/hotfix/20201027.074401 accepted/tizen/5.5/unified/wearable/hotfix/20201027.100727 accepted/tizen/6.0/unified/20201030.110624 accepted/tizen/6.0/unified/hotfix/20201102.234145 accepted/tizen/6.0/unified/hotfix/20201103.051351 accepted/tizen/unified/20180423.062848 accepted/tizen/unified/20180424.082651 accepted/tizen/unified/20201113.022401 submit/tizen/20180417.055303 submit/tizen/20180418.235849 submit/tizen/20180423.013343 submit/tizen/20180424.034521 submit/tizen/20201113.015638 submit/tizen/20201113.015703 submit/tizen_5.0/20181101.000006 submit/tizen_5.5/20191031.000007 submit/tizen_5.5_mobile_hotfix/20201026.185107 submit/tizen_5.5_wearable_hotfix/20201026.184307 submit/tizen_6.0/20201029.205502 submit/tizen_6.0_hotfix/20201102.192902 submit/tizen_6.0_hotfix/20201103.115102 tizen_5.5.m2_release tizen_6.0.m2_release
DongHun Kwak [Tue, 17 Apr 2018 05:27:15 +0000 (14:27 +0900)]
Change package name ( libjosn -> libjson4 )

At json-c 0.13.1, soname is changed
libjson-c.so.2 -> libjson-c.so.4
Maybe, it's occured mic build error.

see the below log
repo problem: murphy-0.0.74-20180406.011749.armv7l requires
libjson-c.so.4, but this requirement cannot be provided, uninstallable
providers: libjson-0.13.1-20180406.011749.armv7l[prerelease]

[Model] All
[BinType] AP
[Customer] OPEN

[Issue#] N/A
[Request] N/A
[Occurrence Version] N/A

[Problem] mic image creating  error
[Cause & Measure] looking error for libjson-c so file at mic building
[Checking Method] mic build test

[Team] Open Source Management and Setting Part
[Developer] dh0128.kwak
[Solution company] Samsung
[Change Type] N/A

Change-Id: I59fbd9ad20132372e7c1626c55bdd42e6df62640
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
6 years agoInstall json_object_private.h file 00/175000/2 submit/tizen/20180406.011307 submit/tizen/20180406.011749 submit/tizen/20180411.073530 submit/tizen/20180413.000848
DongHun Kwak [Fri, 6 Apr 2018 01:09:01 +0000 (10:09 +0900)]
Install json_object_private.h file

[Model] All
[BinType] AP
[Customer] OPEN

[Issue#] N/A
[Request] N/A
[Occurrence Version] N/A

[Problem] json_object_private.h does not installed
[Cause & Measure] murphy package used json_object_private.h file
[Checking Method] build test

[Team] Open Source Management and Setting Part
[Developer] dh0128.kwak
[Solution company] Samsung
[Change Type] N/A

Change-Id: Ic43a248edf519860ecec7a4e2a3ad65b3a7ca85f
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
6 years agoBump to json-c 0.13.1 18/174918/1 submit/tizen/20180405.060924
DongHun Kwak [Thu, 5 Apr 2018 05:28:31 +0000 (14:28 +0900)]
Bump to json-c 0.13.1

[Model] All
[BinType] AP
[Customer] OPEN

[Issue#] N/A
[Request] N/A
[Occurrence Version] N/A

[Problem] version upgrade
[Cause & Measure] json-c 0.12.1 -> 0.13.1
[Checking Method] Unit test

[Team] Open Source Management and Setting Part
[Developer] dh0128.kwak
[Solution company] Samsung
[Change Type] N/A

Change-Id: I7b0f032e8912fe97152df4c8bb5028713ce53104
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
6 years agoMerge tag 'upstream/0.13.1' into tizen 17/174917/1
DongHun Kwak [Thu, 5 Apr 2018 05:25:47 +0000 (14:25 +0900)]
Merge tag 'upstream/0.13.1' into tizen

Change-Id: If9904e50497a5c87a2249c625243e7292fdbdc14
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
6 years agoPrevent ASan bug report about hashlittle 48/173748/1 sandbox/dh0128kwak/json-c_0.12.1 accepted/tizen/unified/20180403.182406 accepted/tizen/unified/20180424.023226 submit/tizen/20180402.004544 submit/tizen/20180402.043231 submit/tizen/20180403.012618 submit/tizen/20180423.113321
Anastasia Lyupa [Fri, 23 Mar 2018 13:35:11 +0000 (16:35 +0300)]
Prevent ASan bug report about hashlittle

ASan reports about heap-buffer-overflow in hashlittle
but it is ok

Change-Id: Ie3c82c19aa509e758594abfd2481a60029ef103f
Signed-off-by: Anastasia Lyupa <a.lyupa@samsung.com>
6 years agoImported Upstream version 0.13.1 93/172793/1 upstream/0.13.1
DongHun Kwak [Fri, 16 Mar 2018 02:32:14 +0000 (11:32 +0900)]
Imported Upstream version 0.13.1

Change-Id: I1e20613dd538ab42d9ba13143edf915d86fd74de
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
6 years agoImported Upstream version 0.13 92/172792/1 upstream/0.13
DongHun Kwak [Fri, 16 Mar 2018 02:31:50 +0000 (11:31 +0900)]
Imported Upstream version 0.13

Change-Id: I265381f2d0b409acb033133448495bf6e4985f4f
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
6 years agoavoid incorrect symbol resolving between json-glib and json-c 38/165838/1 accepted/tizen/unified/20180104.131747 submit/tizen/20180104.084213
MyoungJune Park [Tue, 27 Oct 2015 06:10:01 +0000 (15:10 +0900)]
avoid incorrect symbol resolving between json-glib and json-c

Change-Id: Ieb5ce079c634a403faaba0590f1c09ab9e471ffa
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
6 years agoIssue #275: fix out of bounds read when handling unicode surrogate pairs 80/162080/1 accepted/tizen/unified/20180103.151801 submit/tizen/20180102.225211
DongHun Kwak [Wed, 29 Nov 2017 04:54:24 +0000 (13:54 +0900)]
Issue #275: fix out of bounds read when handling unicode surrogate pairs

https://github.com/json-c/json-c/commit/36a28fcb0c4abf66361d1539380112a1dfe601b2

[Model] All
[BinType] AP
[Customer] OPEN

[Issue#] N/A
[Request] N/A
[Occurrence Version] N/A

[Problem] security problem
[Cause & Measure] security patch
[Checking Method] json-c unit test

[Team] Open Source Management and Setting Part
[Developer] dh0128.kwak
[Solution company] Samsung
[Change Type] N/A

Change-Id: Iac4c44f7637e459b5f018d87ab72a11fa2fea9ed

6 years agoBump to json-c 0.12.1 64/155864/1
DongHun Kwak [Mon, 16 Oct 2017 10:28:49 +0000 (19:28 +0900)]
Bump to json-c 0.12.1

[Model] All
[BinType] AP
[Customer] OPEN

[Issue#] N/A
[Request] N/A
[Occurrence Version] N/A

[Problem] N/A
[Cause & Measure] json-c 0.12 -> 0.12.1
[Checking Method]

[Team] Open Source Management and Setting Part
[Developer] dh0128.kwak
[Solution company] Samsung
[Change Type] N/A

Change-Id: I9bf8d7498ef39575acdee0082466a919115f5110
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
6 years agoMerge tag 'upstream/0.12.1' into tizen 63/155863/1
DongHun Kwak [Mon, 16 Oct 2017 08:46:18 +0000 (17:46 +0900)]
Merge tag 'upstream/0.12.1' into tizen

upstream/0.12.1

Change-Id: Iad133276e57cadaacdf32a8012a72c0b455d2ee1
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
6 years agoImported Upstream version 0.12.1 18/153618/1 upstream/0.12.1
DongHun Kwak [Fri, 29 Sep 2017 02:55:20 +0000 (11:55 +0900)]
Imported Upstream version 0.12.1

Change-Id: I82deb7d4d1814ccadc78c8c5fa3ae7cb7acdb9f5
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
6 years agoAdd unit test 60/138060/1
DongHun Kwak [Tue, 11 Jul 2017 02:47:14 +0000 (11:47 +0900)]
Add unit test

[   75s]
============================================================================
[   75s] Testsuite summary for json-c 0.12
[   75s]
============================================================================
[   75s] # TOTAL: 12
[   75s] # PASS:  12
[   75s] # SKIP:  0
[   75s] # XFAIL: 0
[   75s] # FAIL:  0
[   75s] # XPASS: 0
[   75s] # ERROR: 0
[   75s]
============================================================================

[Model]
[BinType] AP
[Customer] OPEN

[Issue#] N/A
[Request] N/A
[Occurrence Version] N/A

[Problem]
[Cause & Measure]
[Checking Method] N/A

[Team] Open Source Management and Setting Part
[Developer] dh0128.kwak
[Solution company] Samsung
[Change Type] N/A

Change-Id: Ifd16cd617d92862c1787d618c651fd537805af1d
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
6 years agoIssue #275: fix out of bounds read when handling unicode surrogate pairs. 08/137908/1 accepted/tizen_4.0_unified tizen_4.0 tizen_4.0_tv accepted/tizen/4.0/unified/20170816.013752 accepted/tizen/4.0/unified/20170828.222916 accepted/tizen/unified/20170712.164932 submit/tizen/20170711.011459 submit/tizen_4.0/20170811.094300 submit/tizen_4.0/20170828.100006 tizen_4.0.IoT.p1_release tizen_4.0.IoT.p2_release tizen_4.0.m2_release
DongHun Kwak [Mon, 10 Jul 2017 08:26:43 +0000 (17:26 +0900)]
Issue #275: fix out of bounds read when handling unicode surrogate pairs.

Change-Id: Ib3075623b4a251bed5e363e858a73e6913d973a4
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
7 years agoUsing license macro 93/124293/1 accepted/tizen/unified/20170413.161915 submit/tizen/20170413.014723 tizen_4.0.m1_release
DongHun Kwak [Tue, 11 Apr 2017 05:29:13 +0000 (14:29 +0900)]
Using license macro

[Model] ALL
[BinType] AP
[Customer] OPEN

[Issue#] N/A
[Request] N/A
[Occurrence Version] N/A

[Problem] Using license macro
[Cause & Measure] Using license macro
[Checking Method] N/A

[Team] Open Source Management and Setting Part
[Developer] dh0128.kwak
[Solution company] Samsung
[Change Type] N/A

Change-Id: I79f51b0a247edec06920757a9a81673ff6b1a511

7 years agoASan support defines added 85/87185/1 accepted/tizen_3.0.m2_mobile accepted/tizen_3.0.m2_tv accepted/tizen_3.0.m2_wearable accepted/tizen_3.0_common accepted/tizen_3.0_ivi accepted/tizen_3.0_mobile accepted/tizen_3.0_tv accepted/tizen_3.0_wearable accepted/tizen_common accepted/tizen_ivi accepted/tizen_mobile accepted/tizen_tv accepted/tizen_wearable tizen_3.0 tizen_3.0.m2 tizen_3.0_tv accepted/tizen/3.0.m2/mobile/20170104.143020 accepted/tizen/3.0.m2/tv/20170104.143457 accepted/tizen/3.0.m2/wearable/20170104.143858 accepted/tizen/3.0/common/20161114.110851 accepted/tizen/3.0/ivi/20161011.044241 accepted/tizen/3.0/mobile/20161015.033350 accepted/tizen/3.0/tv/20161016.004428 accepted/tizen/3.0/wearable/20161015.082632 accepted/tizen/common/20160909.114817 accepted/tizen/ivi/20160912.093016 accepted/tizen/mobile/20160912.092920 accepted/tizen/tv/20160912.092935 accepted/tizen/unified/20170309.035700 accepted/tizen/wearable/20160912.092955 submit/tizen/20160909.042345 submit/tizen_3.0.m2/20170104.093752 submit/tizen_3.0_common/20161104.104000 submit/tizen_3.0_ivi/20161010.000003 submit/tizen_3.0_mobile/20161015.000003 submit/tizen_3.0_tv/20161015.000002 submit/tizen_3.0_wearable/20161015.000002 submit/tizen_unified/20170308.100413
Slava Barinov [Wed, 15 Jun 2016 08:49:18 +0000 (11:49 +0300)]
ASan support defines added

Change-Id: Idc74911659a8a5a31d97c4bfd9d043cf2c80c62f
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
8 years agoAdjust tizen patch 79/50579/1 accepted/tizen/ivi/20160218.024836 accepted/tizen/mobile/20151106.050947 accepted/tizen/tv/20151106.051002 accepted/tizen/wearable/20151106.051022 submit/tizen/20151030.092326 submit/tizen/20151106.013849 submit/tizen_common/20151229.142028 submit/tizen_common/20151229.144031 submit/tizen_common/20151229.154718 submit/tizen_ivi/20160217.000000 submit/tizen_ivi/20160217.000005
DongHun Kwak [Fri, 30 Oct 2015 07:19:44 +0000 (16:19 +0900)]
Adjust tizen patch

 - fix json-c version at spec file
 - Avoid duplicated symbol resolving (json_object_get_type)
 - delete .gitignore file

Change-Id: Iaa662bcc1a1a90fff01781053f8f11235b2ef1b8
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
8 years agoMerge branch 'upstream' into tizen 78/50578/1
DongHun Kwak [Fri, 30 Oct 2015 05:53:04 +0000 (14:53 +0900)]
Merge branch 'upstream' into tizen

Change-Id: I6038817a084efa0052585d15a9ddace7f32c360c
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
8 years agoavoid incorrect symbol resolving between json-glib and json-c 54/50254/1 accepted/tizen/mobile/20151028.094400 accepted/tizen/tv/20151028.094411 accepted/tizen/wearable/20151028.094428 submit/tizen/20151028.044655
MyoungJune Park [Tue, 27 Oct 2015 06:10:01 +0000 (15:10 +0900)]
avoid incorrect symbol resolving between json-glib and json-c

Change-Id: Ia58e3e82a6015b6eed15525e5acc87df56d9b8ea
Signed-off-by: MyoungJune Park <mj2004.park@samsung.com>
8 years agoImported Upstream version 0.12 99/50199/1 upstream/0.12
DongHun Kwak [Tue, 27 Oct 2015 01:23:00 +0000 (10:23 +0900)]
Imported Upstream version 0.12

Change-Id: If1adf769b75f62becce10d891d0974b9989e6979
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
8 years agoBump to 0.12 22/47222/1
DongHun Kwak [Tue, 1 Sep 2015 05:06:59 +0000 (14:06 +0900)]
Bump to 0.12

Change-Id: Ibaeaeefd08c4a22e8294371867a35dd72dae57c1
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
9 years agoBump to version 0.11 sandbox/kevinthierry/bump-0.11 tizen_3.0.2014.q4_common tizen_3.0.2015.q1_common tizen_3.0.2015.q2_common tizen_3.0.m1_mobile tizen_3.0.m1_tv tizen_3.0_ivi accepted/tizen/common/20141218.123316 accepted/tizen/ivi/20141220.084323 accepted/tizen/mobile/20141219.010224 accepted/tizen/tv/20141219.010128 accepted/tizen/wearable/20141219.010154 submit/tizen/20141217.021523 submit/tizen_common/20151015.190624 submit/tizen_common/20151019.135620 tizen_3.0.m1_mobile_release tizen_3.0.m1_tv_release tizen_3.0.m2.a1_mobile_release tizen_3.0.m2.a1_tv_release tizen_3.0_ivi_release
Kévin THIERRY [Mon, 3 Nov 2014 14:17:15 +0000 (15:17 +0100)]
Bump to version 0.11

Use upstream git repo instead of pristin-tar.

Build with "-j1" to prevent an existing race condition.

Remove duplicate entry for "json_object_iterator.h" which leads to
installation failure.

Bug-Tizen: TC-1831
Change-Id: I6b548537816b1d2b95ccbcea9087050e970dfd5e
Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>
9 years agoresetting manifest requested domain to floor
Alexandru Cornea [Fri, 28 Jun 2013 21:26:47 +0000 (00:26 +0300)]
resetting manifest requested domain to floor

9 years agoadd json_object_iterator.h to headers
Anas Nashif [Tue, 26 Feb 2013 14:48:44 +0000 (06:48 -0800)]
add json_object_iterator.h to headers

9 years agoUpdate to 0.10
Anas Nashif [Tue, 26 Feb 2013 14:21:57 +0000 (06:21 -0800)]
Update to 0.10

9 years agopackage licenses as %license
Anas Nashif [Mon, 26 Nov 2012 21:51:06 +0000 (13:51 -0800)]
package licenses as %license

9 years agoadd packaging, remove patches
Anas Nashif [Mon, 5 Nov 2012 17:33:41 +0000 (09:33 -0800)]
add packaging, remove patches

9 years agoadapt baselibs
Anas Nashif [Mon, 5 Nov 2012 17:31:35 +0000 (09:31 -0800)]
adapt baselibs

9 years agoadd packaging
Anas Nashif [Mon, 5 Nov 2012 17:28:58 +0000 (09:28 -0800)]
add packaging

9 years agoadd packaging
Anas Nashif [Mon, 5 Nov 2012 17:28:19 +0000 (09:28 -0800)]
add packaging

11 years agoDrop the libtool versions back down a bit to avoid changing the major number of the... upstream/0.11
Eric Haszlakiewicz [Wed, 3 Apr 2013 02:04:18 +0000 (21:04 -0500)]
Drop the libtool versions back down a bit to avoid changing the major number of the library.  Programs compiled against v0.10 should work ok with v0.11.

11 years agoRegen the doc pages using the right version for the 0.11 release.
Eric Haszlakiewicz [Mon, 1 Apr 2013 02:34:53 +0000 (21:34 -0500)]
Regen the doc pages using the right version for the 0.11 release.

11 years agoBump the version numbers for the 0.11 release.
Eric Haszlakiewicz [Mon, 1 Apr 2013 02:33:59 +0000 (21:33 -0500)]
Bump the version numbers for the 0.11 release.

11 years agoAdd the 0.11 release doxygen-generated docs to source control.
Eric Haszlakiewicz [Mon, 1 Apr 2013 02:10:01 +0000 (21:10 -0500)]
Add the 0.11 release doxygen-generated docs to source control.

11 years agoAdd automake/autoconf generated files for the 0.11 release.
Eric Haszlakiewicz [Mon, 1 Apr 2013 02:02:23 +0000 (21:02 -0500)]
Add automake/autoconf generated files for the 0.11 release.

11 years agoMerge branch 'master' of https://github.com/json-c/json-c
Eric Haszlakiewicz [Mon, 1 Apr 2013 01:58:54 +0000 (20:58 -0500)]
Merge branch 'master' of https://github.com/json-c/json-c

11 years agoBump up the version in the release checklist to 0.11
Eric Haszlakiewicz [Mon, 1 Apr 2013 01:58:30 +0000 (20:58 -0500)]
Bump up the version in the release checklist to 0.11

11 years agoUpdate the changelog with changes since the 0.10 release.
Eric Haszlakiewicz [Mon, 1 Apr 2013 01:57:08 +0000 (20:57 -0500)]
Update the changelog with changes since the 0.10 release.

11 years agoUpdate config.h.in to add the HAVE_SETLOCALE and HAVE_LOCALE_H lines.
Eric Haszlakiewicz [Mon, 1 Apr 2013 01:34:28 +0000 (20:34 -0500)]
Update config.h.in to add the HAVE_SETLOCALE and HAVE_LOCALE_H lines.

11 years agoIssue #15: add a way to set a JSON_TOKENER_STRICT flag to forbid commas at the end...
Eric Haszlakiewicz [Mon, 1 Apr 2013 01:05:36 +0000 (20:05 -0500)]
Issue #15: add a way to set a JSON_TOKENER_STRICT flag to forbid commas at the end of arrays and objects.

11 years agoMerge pull request #73 from ghazel/master
Eric Haszlakiewicz [Sun, 24 Mar 2013 00:06:03 +0000 (17:06 -0700)]
Merge pull request #73 from ghazel/master

one definition of json_object_object_foreach only works on c99 and later

11 years agoone definition of json_object_object_foreach only works on c99 and later
Greg Hazel [Tue, 19 Mar 2013 23:26:12 +0000 (16:26 -0700)]
one definition of json_object_object_foreach only works on c99 and later

11 years agoMerge pull request #71 from WillDignazio/master
Eric Haszlakiewicz [Sat, 16 Mar 2013 04:19:48 +0000 (21:19 -0700)]
Merge pull request #71 from WillDignazio/master

Fix Broken Build, Check ADVANCE_CHAR

11 years agoFix broken build by using ADVANCE_CHAR macro return.
William Dignazio [Thu, 7 Mar 2013 01:18:14 +0000 (20:18 -0500)]
Fix broken build by using ADVANCE_CHAR macro return.

We forget to check or use the return value of the ADVANCE_CHAR macro,
and upon compilation an error is thrown because of its lack of use. This
patch checks to see if the macro was successful, and if not replaces the
offending character with a replacement.

11 years agoRename misnomer POP_CHAR to PEEK_CHAR.
William Dignazio [Wed, 6 Mar 2013 17:29:33 +0000 (12:29 -0500)]
Rename misnomer POP_CHAR to PEEK_CHAR.
While parsing token data, we use the POP_CHAR macro to 'peek' at
character data. This behaviour is noted in the comments for the macro,
yet the definition is left as 'pop'. Changing to PEEK_CHAR does not
imply that the character being observed is removed.

11 years agoMerge pull request #70 from tg--/master
Eric Haszlakiewicz [Mon, 4 Mar 2013 04:34:34 +0000 (20:34 -0800)]
Merge pull request #70 from tg--/master

rename AM_CONFIG_HEADER to AC_CONFIG_HEADER

11 years agoIssue #68: use -std=gnu99 because some versions of gcc seem to think that -std=c99...
Eric Haszlakiewicz [Mon, 4 Mar 2013 04:26:28 +0000 (22:26 -0600)]
Issue #68: use -std=gnu99 because some versions of gcc seem to think that -std=c99 also implies -ansi, which causes warnings and build breakage.

11 years agoconfigure.in: mv AM_CONFIG_HEADER to AC_CONFIG_HEADER
Thomas Gstädtner [Sat, 2 Mar 2013 23:17:25 +0000 (00:17 +0100)]
configure.in: mv AM_CONFIG_HEADER to AC_CONFIG_HEADER

the former has been deprecated and does not work on newer autoconf
versions.

11 years agoInclude the test_locale test in the tests that run.
Eric Haszlakiewicz [Wed, 27 Feb 2013 03:14:07 +0000 (21:14 -0600)]
Include the test_locale test in the tests that run.

11 years agoMerge branch 'remicollet-issue-float'
Eric Haszlakiewicz [Wed, 27 Feb 2013 03:09:10 +0000 (21:09 -0600)]
Merge branch 'remicollet-issue-float'

Conflicts:
json_util.c

11 years agoImported Upstream version 0.10 upstream/0.10
Anas Nashif [Tue, 26 Feb 2013 14:15:07 +0000 (06:15 -0800)]
Imported Upstream version 0.10

11 years agoMark the "val" variable in json_object_object_foreach as unused so the compiler doesn...
Eric Haszlakiewicz [Thu, 21 Feb 2013 18:32:29 +0000 (12:32 -0600)]
Mark the "val" variable in json_object_object_foreach as unused so the compiler doesn't complain.  Fix warnings in the testReplaceExisting test.

11 years agoAdd a runtime check to see if parse_int64 needs to workaround sscanf bugs. If that...
Eric Haszlakiewicz [Sat, 9 Feb 2013 23:35:33 +0000 (17:35 -0600)]
Add a runtime check to see if parse_int64 needs to workaround sscanf bugs.  If that workaround is not needed parsing is nearly twice as fast.

11 years agoEnable -Werror and fix a number of minor warnings that existed.
Eric Haszlakiewicz [Sat, 9 Feb 2013 22:35:24 +0000 (16:35 -0600)]
Enable -Werror and fix a number of minor warnings that existed.

11 years agoAdd a comment briefly describing json_object_object_length()
Eric Haszlakiewicz [Sat, 9 Feb 2013 22:18:05 +0000 (16:18 -0600)]
Add a comment briefly describing json_object_object_length()

11 years agoMerge pull request #62 from ghazel/master
Eric Haszlakiewicz [Sat, 9 Feb 2013 22:14:33 +0000 (14:14 -0800)]
Merge pull request #62 from ghazel/master

json_object_object_length

11 years agoMerge pull request #66 from ichernev/fix-test-parse
Eric Haszlakiewicz [Sat, 9 Feb 2013 21:59:51 +0000 (13:59 -0800)]
Merge pull request #66 from ichernev/fix-test-parse

Fixed test_parse for \f

11 years agoFixed test_parse for \f
Iskren Chernev [Tue, 29 Jan 2013 03:06:49 +0000 (19:06 -0800)]
Fixed test_parse for \f

11 years agoadd json_object_object_length
Greg Hazel [Fri, 11 Jan 2013 09:36:55 +0000 (01:36 -0800)]
add json_object_object_length

11 years agoMerge pull request #60 from ghazel/master
Eric Haszlakiewicz [Wed, 9 Jan 2013 23:26:42 +0000 (15:26 -0800)]
Merge pull request #60 from ghazel/master

rename _errno

11 years agorename _errno
Greg Hazel [Fri, 4 Jan 2013 00:54:04 +0000 (16:54 -0800)]
rename _errno

11 years agoMerge pull request #58 from Abioy/master
Eric Haszlakiewicz [Wed, 2 Jan 2013 18:08:44 +0000 (10:08 -0800)]
Merge pull request #58 from Abioy/master

escape '\f' in json_escape_str

11 years agoescape '\f' in json_escape_str
Abioy [Mon, 24 Dec 2012 14:22:05 +0000 (22:22 +0800)]
escape '\f' in json_escape_str

'\f' is a llegal char and should be escape in printbuf

11 years agoBump the version up to 0.10.99 to make it clear that the master branch is beyond...
Eric Haszlakiewicz [Sun, 23 Dec 2012 17:09:20 +0000 (11:09 -0600)]
Bump the version up to 0.10.99 to make it clear that the master branch is beyond anything on the 0.10 branch.

11 years agoMerge branch 'master' of https://github.com/json-c/json-c
Eric Haszlakiewicz [Sun, 23 Dec 2012 16:59:52 +0000 (10:59 -0600)]
Merge branch 'master' of https://github.com/json-c/json-c

11 years agoAdd a json_c_version.h header (included from json.h), and several macros and function...
Eric Haszlakiewicz [Sun, 23 Dec 2012 16:57:44 +0000 (10:57 -0600)]
Add a json_c_version.h header (included from json.h), and several macros and functions for retrieving the json-c version at compile-time and run-time.

11 years agoMerge pull request #51 from remicollet/issue-dyndepth
Eric Haszlakiewicz [Sun, 23 Dec 2012 16:39:46 +0000 (08:39 -0800)]
Merge pull request #51 from remicollet/issue-dyndepth

Make maximum recursion depth a runtime option

11 years agoUpdate the release checklist to include the INSTALL file, and adjust the git command...
Eric Haszlakiewicz [Sun, 23 Dec 2012 16:27:14 +0000 (10:27 -0600)]
Update the release checklist to include the INSTALL file, and adjust the git command to add the doc directory.

11 years agoRevert the test_null test back to emitted to stdout, and update the expected output...
Eric Haszlakiewicz [Sun, 23 Dec 2012 16:25:03 +0000 (10:25 -0600)]
Revert the test_null test back to emitted to stdout, and update the expected output to match.

11 years agoMerge pull request #56 from TheCount/develop
Eric Haszlakiewicz [Sun, 23 Dec 2012 16:23:13 +0000 (08:23 -0800)]
Merge pull request #56 from TheCount/develop

Some houskeeping

11 years agoMore warnings, fewer errors, C99
Alexander Klauer [Wed, 19 Dec 2012 12:55:02 +0000 (13:55 +0100)]
More warnings, fewer errors, C99

11 years agoPrepend DESTDIR to paths for staged installs
Alexander Klauer [Wed, 19 Dec 2012 12:16:38 +0000 (13:16 +0100)]
Prepend DESTDIR to paths for staged installs

11 years agoWrite additional test info to stderr instead of stdout so as not to mar the expected...
Alexander Klauer [Wed, 19 Dec 2012 09:52:50 +0000 (10:52 +0100)]
Write additional test info to stderr instead of stdout so as not to mar the expected output

11 years agoFixed memory leak in testReplaceExisting
Alexander Klauer [Wed, 19 Dec 2012 09:46:35 +0000 (10:46 +0100)]
Fixed memory leak in testReplaceExisting

11 years agoMake macro json_object_object_foreach multiple-use safe
Alexander Klauer [Wed, 19 Dec 2012 09:31:39 +0000 (10:31 +0100)]
Make macro json_object_object_foreach multiple-use safe

11 years agoRemove and ignore autogenerated installation instructions
Alexander Klauer [Wed, 19 Dec 2012 08:40:10 +0000 (09:40 +0100)]
Remove and ignore autogenerated installation instructions

11 years agoIgnore editor swap files
Alexander Klauer [Wed, 19 Dec 2012 08:38:45 +0000 (09:38 +0100)]
Ignore editor swap files

11 years agoIgnore doc dir for now
Alexander Klauer [Tue, 18 Dec 2012 17:53:04 +0000 (18:53 +0100)]
Ignore doc dir for now

11 years agoLibrary is now called libjson-c
Alexander Klauer [Tue, 18 Dec 2012 17:46:24 +0000 (18:46 +0100)]
Library is now called libjson-c

11 years agoNeed to explicitly remove include/json-c directory
Alexander Klauer [Tue, 18 Dec 2012 17:45:39 +0000 (18:45 +0100)]
Need to explicitly remove include/json-c directory

11 years ago-d test is useless as symlinks are dereferenced
Alexander Klauer [Tue, 18 Dec 2012 17:44:52 +0000 (18:44 +0100)]
-d test is useless as symlinks are dereferenced

11 years agoIgnore valgrind output files
Alexander Klauer [Tue, 18 Dec 2012 17:27:39 +0000 (18:27 +0100)]
Ignore valgrind output files

11 years agoprobably worth an option for this
Remi Collet [Thu, 13 Dec 2012 10:46:04 +0000 (11:46 +0100)]
probably worth an option for this

11 years agoSave space, drop unuseful trailing zeroes
Remi Collet [Thu, 13 Dec 2012 10:22:31 +0000 (11:22 +0100)]
Save space, drop unuseful trailing zeroes

11 years agoSimple fix to double encode
Remi Collet [Thu, 13 Dec 2012 10:16:03 +0000 (11:16 +0100)]
Simple fix to double encode

11 years agomove locale change to be global for perf
Remi Collet [Thu, 13 Dec 2012 08:47:33 +0000 (09:47 +0100)]
move locale change to be global for perf

11 years agoFix issue #53 - ensure explicit length string are still NUL terminated, and fix json_...
Eric Haszlakiewicz [Sun, 9 Dec 2012 22:32:11 +0000 (16:32 -0600)]
Fix issue #53 - ensure explicit length string are still NUL terminated, and fix json_tokener_parse() to work properly with embedded unicode \u0000 values in strings.
Adjust test_null to check for this case.
See also http://bugs.debian.org/687269

11 years agoRemove configure as part of maintainer-clean instead of distclean. Addresses issue...
Eric Haszlakiewicz [Sun, 9 Dec 2012 21:46:35 +0000 (15:46 -0600)]
Remove configure as part of maintainer-clean instead of distclean.  Addresses issue #48.

11 years agoAdd PACKAGE_URL to config.h.in
Eric Haszlakiewicz [Sun, 9 Dec 2012 21:46:23 +0000 (15:46 -0600)]
Add PACKAGE_URL to config.h.in

11 years agoAdd a missing json_object_get() so we don't try to use a freed object in test1.
Eric Haszlakiewicz [Thu, 29 Nov 2012 20:06:17 +0000 (15:06 -0500)]
Add a missing json_object_get() so we don't try to use a freed object in test1.

11 years agoFix a memory leak in the test_printbuf test.
Eric Haszlakiewicz [Thu, 29 Nov 2012 19:29:55 +0000 (13:29 -0600)]
Fix a memory leak in the test_printbuf test.

11 years agoInclude json_object_iterator.c in the list of sources.
Eric Haszlakiewicz [Thu, 29 Nov 2012 19:23:06 +0000 (13:23 -0600)]
Include json_object_iterator.c in the list of sources.

11 years agofloat parsing must be locale independent
Remi Collet [Tue, 27 Nov 2012 10:06:49 +0000 (11:06 +0100)]
float parsing must be locale independent

11 years agoMake maximum recursion depth a runtime option
Remi Collet [Tue, 27 Nov 2012 08:01:45 +0000 (09:01 +0100)]
Make maximum recursion depth a runtime option

11 years agoImported Upstream version 0.9 upstream/0.9
Anas Nashif [Mon, 5 Nov 2012 17:28:19 +0000 (09:28 -0800)]
Imported Upstream version 0.9

11 years agoMake it safe to delete keys while iterating with the json_object_object_foreach macro.
Eric Haszlakiewicz [Sun, 21 Oct 2012 01:26:37 +0000 (20:26 -0500)]
Make it safe to delete keys while iterating with the json_object_object_foreach macro.

11 years agoReformat the json_object_object_foreach macro so it is readable, and document what...
Eric Haszlakiewicz [Sun, 21 Oct 2012 01:10:15 +0000 (20:10 -0500)]
Reformat the json_object_object_foreach macro so it is readable, and document what is allowed to be done with the object while iterating.

11 years agoReformat json_object_object_get() and json_object_object_get_ex().
Eric Haszlakiewicz [Thu, 18 Oct 2012 22:16:36 +0000 (17:16 -0500)]
Reformat json_object_object_get() and json_object_object_get_ex().

11 years agoFix json_object_object_get() so it returns NULL if the incoming json_object is NULL.
Eric Haszlakiewicz [Thu, 18 Oct 2012 22:14:41 +0000 (17:14 -0500)]
Fix json_object_object_get() so it returns NULL if the incoming json_object is NULL.

11 years agoChange json_object_put to return 1 if the object passed was actually freed. (or 0...
Eric Haszlakiewicz [Thu, 18 Oct 2012 22:10:09 +0000 (17:10 -0500)]
Change json_object_put to return 1 if the object passed was actually freed. (or 0 if only the reference count was decremented)