Commit Graph

Select branches

Hide Pull Requests

disallow-control-chars

gh-pages

issue808-ios-build

json-c-0.10

json-c-0.11

json-c-0.12

json-c-0.13

json-c-0.14

json-c-0.15

json-c-0.16

json-c-0.17

json-c-0.18

json_object-split

master

#104

#104

#105

#105

#106

#106

#107

#109

#11

#11

#112

#113

#113

#119

#119

#12

#12

#121

#123

#124

#124

#125

#125

#126

#126

#127

#127

#128

#128

#132

#133

#141

#144

#145

#145

#148

#148

#149

#150

#151

#153

#155

#156

#16

#16

#162

#162

#163

#164

#164

#168

#171

#174

#177

#179

#18

#180

#182

#183

#184

#184

#186

#19

#19

#191

#193

#194

#194

#196

#198

#199

#20

#20

#200

#208

#208

#209

#21

#21

#210

#211

#211

#216

#218

#219

#220

#222

#223

#23

#23

#230

#231

#231

#232

#233

#234

#238

#239

#24

#24

#241

#241

#243

#248

#248

#249

#25

#25

#250

#251

#252

#253

#254

#255

#26

#26

#262

#262

#267

#27

#27

#272

#273

#274

#277

#282

#282

#283

#285

#287

#288

#288

#289

#29

#29

#290

#290

#294

#294

#299

#30

#30

#303

#305

#31

#31

#310

#311

#312

#319

#32

#32

#321

#325

#328

#329

#33

#33

#330

#331

#331

#333

#335

#336

#34

#34

#340

#344

#345

#346

#354

#354

#355

#355

#359

#360

#361

#362

#362

#363

#365

#37

#37

#372

#373

#38

#38

#381

#383

#383

#384

#386

#387

#388

#389

#390

#391

#392

#393

#399

#4

#4

#402

#410

#415

#42

#42

#420

#421

#428

#431

#432

#433

#433

#434

#436

#44

#44

#441

#443

#443

#444

#45

#45

#450

#452

#453

#454

#455

#456

#457

#458

#459

#461

#462

#464

#467

#468

#471

#473

#474

#476

#483

#484

#485

#490

#491

#493

#495

#496

#497

#499

#500

#501

#505

#51

#51

#510

#511

#512

#514

#515

#516

#517

#519

#52

#52

#522

#523

#524

#525

#526

#527

#528

#529

#530

#531

#533

#536

#537

#538

#541

#542

#543

#544

#545

#546

#547

#55

#55

#551

#553

#555

#556

#558

#56

#56

#561

#562

#563

#564

#565

#566

#567

#568

#571

#572

#573

#575

#576

#577

#578

#579

#58

#58

#580

#581

#582

#583

#583

#584

#585

#587

#589

#59

#59

#590

#591

#592

#595

#597

#6

#6

#60

#60

#602

#603

#606

#607

#608

#609

#61

#61

#610

#611

#612

#613

#614

#617

#618

#619

#62

#62

#620

#622

#624

#625

#626

#627

#628

#629

#632

#633

#634

#639

#64

#640

#646

#648

#65

#65

#650

#651

#653

#655

#656

#657

#659

#66

#66

#660

#661

#662

#663

#664

#665

#667

#669

#670

#671

#673

#674

#675

#679

#680

#680

#689

#694

#696

#7

#7

#70

#70

#700

#701

#702

#703

#704

#706

#71

#71

#714

#715

#715

#716

#717

#718

#722

#724

#726

#727

#728

#729

#73

#73

#732

#734

#735

#737

#739

#740

#740

#741

#742

#744

#745

#746

#748

#749

#750

#751

#752

#754

#755

#757

#758

#759

#760

#765

#769

#771

#772

#776

#777

#779

#78

#78

#781

#782

#783

#784

#789

#790

#794

#796

#8

#8

#80

#80

#802

#803

#804

#805

#805

#810

#813

#822

#825

#826

#827

#828

#831

#832

#832

#834

#835

#837

#839

#845

#846

#847

#849

#852

#858

#859

#860

#861

#864

#866

#871

#872

#873

#877

#878

#879

#88

#88

#882

#883

#884

#888

#89

#89

#890

#890

#893

#895

#898

#899

#90

#90

#900

#901

#903

#904

#905

#906

#907

#908

#910

#913

#915

#917

#93

#93

#94

#94

#95

#95

#96

#96

#97

#97

json-c-0.10-20120530

json-c-0.11-20130402

json-c-0.12-20140410

json-c-0.12.1-20160607

json-c-0.13-20171207

json-c-0.13.1-20180305

json-c-0.14-20200419

json-c-0.15-20200726

json-c-0.16-20220414

json-c-0.17-20230812

json-c-0.18-20240915

Mono Color

• b484ff0b6d Merge d447fbc from master to json-c-0.13, to avoid installing private headers. Eric Haszlakiewicz 2017-12-07 18:24:39 -05:00
• d447fbca77 Don't include private headers when installing. Eric Haszlakiewicz 2017-12-07 18:24:08 -05:00
• 17374f345d Add generated docs for the 0.13 release. Eric Haszlakiewicz 2017-12-07 18:06:19 -05:00
• 0c991854a1 Save autoconf/automake generated files for the new 0.13 release. Eric Haszlakiewicz 2017-12-07 18:05:30 -05:00
• 1f3bc5f20c Bump the version up to 0.13 Eric Haszlakiewicz 2017-12-07 18:03:29 -05:00
• d582d3ae5a Undeprecate the array_list, lh_table and printbuf typedefs, but move each to the corresponding header files. Eric Haszlakiewicz 2017-12-06 23:56:23 -05:00
• 8c82f0e5c3 Squash doxygen warnings, and make a few slight improvements to the docs. Eric Haszlakiewicz 2017-12-06 23:53:12 -05:00
• 219025727d Upgrade doxygen's Doxyfile to version 1.8.8 Eric Haszlakiewicz 2017-12-06 00:27:53 -05:00
• f2f103b986 Add a brief overview of each file to the docs. Eric Haszlakiewicz 2017-12-06 00:20:59 -05:00
• d6d81e6ece Adjust the description of json_object_iterator a bit. Eric Haszlakiewicz 2017-12-05 18:25:03 -05:00
• c01635e03e Rearrange README.md a bit and make it work better in the doxygen generated docs. Also, add a table of contents, and a brief section on using json-c with links to the header files most likely to be useful. Eric Haszlakiewicz 2017-12-05 18:01:43 -05:00
• ae242720b6 Add a couple more issues to the list of those closed for 0.13 Eric Haszlakiewicz 2017-12-05 18:00:09 -05:00
• 11ab365324 Deprecated a few typedefs, add docs on json_object_iter, move json_number_chars and json_hex-chars to json_object_private.h. Eric Haszlakiewicz 2017-12-05 09:20:59 -05:00
• a47eafe868 Cast to int64_t instead of long in test_int_add to fix the test on 32-bit platforms. Eric Haszlakiewicz 2017-12-05 04:32:12 +00:00
• 0e7ec2ffcd Add cast to int on tolower() to fix warnings about array subscripts. Eric Haszlakiewicz 2017-12-05 04:29:36 +00:00
• aedd36ac8b Make sure to include the "*" on function pointer arguments to avoid a warnings from VS2015. See also PR#384. Eric Haszlakiewicz 2017-12-04 18:17:52 -05:00
• 95015d474e Merge pull request #384 from ssrlive/patch-1 Eric Haszlakiewicz 2017-12-04 18:11:09 -05:00
• 2643658b6f Update json_object.c ssrlive 2017-12-04 14:46:41 +08:00
• 7709cb1355 Fix a VS 2015 compiler warning. ssrlive 2017-12-04 14:43:25 +08:00
• b34d26ff25 Add a change log entry for the upcoming 0.13 release. Eric Haszlakiewicz 2017-12-02 22:13:22 -05:00
• e00a07b885 Clean up *.vg.out files too to "make distcheck" works. Eric Haszlakiewicz 2017-11-30 18:10:25 -05:00
• 5dae561d33 In json_object_deep_copy(), copy over _userdata, at least for json_type_string's with the default serializer set, and provide a way for people using custom serializers to provide a custom shallow_copy method. Eric Haszlakiewicz 2017-11-29 23:35:38 -05:00
• 96efeadd6e Always build the json_object_deep_copy() code, but conditionalize running it on a --benchmark command line option. Eric Haszlakiewicz 2017-11-29 17:57:51 -05:00
• 437716c5b4 Rename _set_last_err() to _json_c_set_last_err(). Eric Haszlakiewicz 2017-11-29 09:25:11 -05:00
• d99edade72 Merge branch 'commodo-json_deep_copy' Eric Haszlakiewicz 2017-11-29 09:13:32 -05:00
• 4dd92180c6 Merge branch 'json_deep_copy' of https://github.com/commodo/json-c into commodo-json_deep_copy Eric Haszlakiewicz 2017-11-29 09:12:59 -05:00
• 3628f16dd6 Rename json_object_add_int() to json_object_int_inc() and eliminate the "int64" variant since we store 64-bit values internally anyway. Eric Haszlakiewicz 2017-11-27 17:57:36 -05:00
• 1eab22f0da tests: add test_deep_copy test Alexandru Ardelean 2017-06-16 10:50:49 +03:00
• bf80d5ad0e json_object: implement json_object_deep_copy() Alexandru Ardelean 2017-06-16 10:05:32 +03:00
• 91662a5b69 Merge pull request #363 from jvijtiuk/integer_addition Eric Haszlakiewicz 2017-11-27 09:06:39 -05:00
• 9c9529f798 Update test_parse.expected to match the code. Eric Haszlakiewicz 2017-11-27 08:48:08 -05:00
• f81da5e57a Rewrite the json_tokener_state_inf handling in json_tokener to be simpler, and avoid needless copying of the input into a temporary buffer. Eric Haszlakiewicz 2017-11-27 00:20:11 -05:00
• 31a6c2fac8 Add a few more tests to the partial parse to cover bytes after "Infinity". Eric Haszlakiewicz 2017-11-27 00:18:55 -05:00
• ba11d334db Save proper expected output for test_parse from the previous commit. Eric Haszlakiewicz 2017-11-27 00:08:59 -05:00
• 48f7e389fb Fix parsing of "-Infinity" when the "-" and "Infinity" are split across multiple calls. Add several additional test cases for partial parsing of infinity values. Eric Haszlakiewicz 2017-11-27 00:04:33 -05:00
• 0e1d83f980 Adjust the "-Infinity" fix on the json-c-0.12 branch to match the master branch. Eric Haszlakiewicz 2017-11-26 23:31:00 -05:00
• 2fc68d46ac Note a hack that's needed when building from the json-c-0.12 git branch (vs a release tarball) to prevent the dependency handling from trying to run automake. Eric Haszlakiewicz 2017-11-26 23:16:54 -05:00
• c7e3e0d2de Merge pull request #372 from jlguardi/json-c-0.12 Eric Haszlakiewicz 2017-11-26 23:26:37 -05:00
• 4d1e0b4409 Issue #371: fix parsing of "-Infinity" (although in a somewhat different location than PR#372 used), and add a case to test_parse to check for this. Eric Haszlakiewicz 2017-11-26 22:42:40 -05:00
• 2a22858fe7 Add a few extra cases to test_parse to show how trailing bytes are handled, especially for parsing "Infinity". Eric Haszlakiewicz 2017-11-26 22:34:43 -05:00
• b8738dd623 Rewrite test_basic_parse() to factor out a single_basic_parse() to avoid lots of duplicate boiler plate code. Also, emit the input string in the output so it's easier to see what's going on. Eric Haszlakiewicz 2017-11-26 22:31:48 -05:00
• 05c85ddc21 On VS 2013 and newer, actually use strtoll instead of redefining it to _strtoi64. Eric Haszlakiewicz 2017-11-26 14:17:17 -05:00
• 04788421fe Merge pull request #373 from commodo/fix-appveyor-build Eric Haszlakiewicz 2017-11-26 14:08:53 -05:00
• 49003242d1 Merge pull request #381 from busterb/fix-makedist Eric Haszlakiewicz 2017-11-26 13:57:54 -05:00
• 185f43afef add/remove missing distribution files Brent Cook 2017-11-26 08:29:45 -06:00
• 6727b46454 ignore more autoconf goo Brent Cook 2017-11-26 08:26:18 -06:00
• 03f3b95248 json_util: define strtoll as _strtoi64 for MSVC Alexandru Ardelean 2017-11-07 16:50:58 +02:00
• 5641227c9b strerror_override: re-organize strerror_override.h Alexandru Ardelean 2017-11-07 16:21:52 +02:00
• 83c29cf1f4 Fixed #371: -Infinity correctly parsed after other Infinity Jlguardi 2017-11-03 09:55:39 +01:00
• 431bd0c01e Improved testing for Infinity Jlguardi 2017-11-03 09:51:16 +01:00
• 239c849575 Fixed testReplaceExisting compilation error Jlguardi 2017-11-03 09:32:33 +01:00
• fabb84a785 Remove out of date win32 build information, and mention the need to use cmake there. Eric Haszlakiewicz 2017-10-22 22:46:05 -04:00
• e424af32b7 Fix definition of NELEM in the tests. Eric Haszlakiewicz 2017-10-22 22:28:35 -04:00
• ac09581cc2 Issue #370: work around Clang-on-windows oddities by rearranging ifdefs. Eric Haszlakiewicz 2017-10-22 22:19:41 -04:00
• c9c84ca7ee Issue #369: note some useful settings when building for Android. Eric Haszlakiewicz 2017-10-19 23:30:51 -04:00
• cf913621f1 Use cmake to create the json-c.pc file, as suggested by PR#362. Eric Haszlakiewicz 2017-10-09 13:16:00 -04:00
• ddc97b2950 Merge pull request #365 from mbehr1/json-c-0.12 Eric Haszlakiewicz 2017-10-04 18:19:40 -04:00
• 579f0746f0 Issue #173, follow up to using strtoll to allow this to work on older Windows environments: Use cmake to generate config.h from config.h.win32, including checking for strtoll with cmake, or fall back to _strtoi64 for older MSVC's. Also, add a few missing files to the list of sources to build. Eric Haszlakiewicz 2017-10-03 22:50:29 -04:00
• ec8912bb91 added fallthrough for gcc7 Matthias Behr 2017-10-03 09:26:59 +02:00
• cfbdf7757b The new cmake-generated VS builds now generate a dynamic .dll instead of a .lib Eric Haszlakiewicz 2017-09-17 21:44:04 -04:00
• 139eb64b43 For appveyor builds, json_config.h is actually generated in the "include" directory. Eric Haszlakiewicz 2017-09-17 21:35:53 -04:00
• 66a77d129a Split the list of cmake headers into public and private ones, and only install the public ones. Eric Haszlakiewicz 2017-09-17 21:27:07 -04:00
• 8899f3fbfb Add a "cmake ." line to the appveyor build file to try to get it working again. Eric Haszlakiewicz 2017-09-17 21:25:49 -04:00
• 1110e84cce Add json_object_add_int functions Juraj Vijtiuk 2017-09-14 08:05:33 -04:00
• dc79d94c38 Merge pull request #361 from schwehr/int64 Eric Haszlakiewicz 2017-09-11 21:25:27 -04:00
• d9879c2533 Fix double to int cast overflow in json_object_get_int64. Kurt Schwehr 2017-09-11 07:23:00 -07:00
• 5454c4eaa3 Merge pull request #360 from jasonbking/master Eric Haszlakiewicz 2017-09-07 22:45:48 -04:00
• 4ac47a0219 Issue#353: attempt to fix or ignore a few -Wdocumentation messages from Clang. Eric Haszlakiewicz 2017-09-07 22:22:25 -04:00
• edde8eff9f Issue#353: mark lh_abort as actually deprecated, not just in the docs. Eric Haszlakiewicz 2017-09-07 22:21:29 -04:00
• e3fabe9a44 Add long long 64-bit check Jason King 2017-09-08 01:46:06 +00:00
• 5355d387e9 Use strtoll to parse ints Jason King 2017-09-07 17:21:14 +00:00
• e1561ed1df Remove the Visual Studio project files as they were out of date, and should now be generated by using cmake. Eric Haszlakiewicz 2017-09-06 23:50:03 -04:00
• 7e608c5728 Issue #359: Use consistent spacing in CMakeLists.txt Eric Haszlakiewicz 2017-09-06 23:40:20 -04:00
• 32f503f738 Issue #359: Don't duplicate lh_get_hash, just omit the "inline" for VS2010. Eric Haszlakiewicz 2017-09-06 23:39:23 -04:00
• d58693b0f0 Merge pull request #359 from Haffon/api-0.12 Eric Haszlakiewicz 2017-09-06 23:20:36 -04:00
• 837a249f01 set JSON_C_HEADERS full file name Haffon 2017-09-07 10:39:14 +08:00
• e9f9f14f22 if compile with vs2015, enable the "static inline" declare. Haffon 2017-09-07 10:28:26 +08:00
• b301f4ea01 rollback api to 0.12 Haffon 2017-09-07 10:02:21 +08:00
• 86a3a6475f Merge pull request #2 from json-c/master Haffon 2017-09-07 09:33:07 +08:00
• 548d000891 Undo a bit of 2d1da5ab: handle per-thread formats for double serialization, even if --enable-threading wasn't specified. Eric Haszlakiewicz 2017-09-05 01:56:42 -04:00
• b2afca4560 Issue #173: since some sscanf implementations return 0 for non-zero inputs, directly check for "0" in the input. Eric Haszlakiewicz 2017-09-05 01:53:13 -04:00
• 2d1da5ab13 Add a --enable-threading configure option, and only use the (slower) __sync_add_and_fetch()/__sync_sub_and_fetch() function when it is specified. Eric Haszlakiewicz 2017-09-03 23:37:12 -04:00
• 8777c9477a Use AC_CONFIG_MACRO_DIRS to specify path to the ax macros instead of passing -I to autoreconf in autogen.sh. Eric Haszlakiewicz 2017-09-03 22:35:58 -04:00
• 5b11e9adff Explicitly check for GCC's atomic functions instead of depending on the __GNUC__ define. Add a comment mentioning the limitation even though the _ref_count value is hanled atomically. Eric Haszlakiewicz 2017-09-02 14:48:17 -04:00
• ab0d4dbc69 Merge branch 'pull-211' This is EmielBruijntes' "Atomic updates for the refcount" Eric Haszlakiewicz 2017-09-02 13:54:15 -04:00
• 95dff31951 Issue #351: don't redefine SIZE_T_MAX if it's already defined. Eric Haszlakiewicz 2017-08-30 23:35:56 -04:00
• 447d67d5f3 Issue #349: none of automake's clean targets are suite for really cleaning up everything, so add a local "really-clean" target that does so. Eric Haszlakiewicz 2017-08-30 23:17:24 -04:00
• 95e174e2fb Merge pull request #1 from json-c/master Haffon 2017-08-30 00:02:59 +08:00
• 81f6edbfd5 PR#331: for Visual Studio, use a snprintf/vsnprintf wrapper that ensures the string is terminated. Eric Haszlakiewicz 2017-08-25 01:15:39 -04:00
• 3141c3976b 1.make it can been compiled with Visual Studio 2010 2.replace json_object_get/put API with json_object_retain/release, as they operate the reference counter, and confused with array_list_get/put_idx. 3.replace array_list_get/put_idx API with array_list_get/insert to make them more clear to use. Haffon 2017-08-22 13:53:47 +08:00
• 256ebcd827 Merge pull request #346 from schwehr/get_int Eric Haszlakiewicz 2017-08-21 20:50:58 -05:00
• 474376f30a Merge pull request #345 from MrAnno/fix-make-dist Eric Haszlakiewicz 2017-08-21 20:50:20 -05:00
• 2f1fe55f66 Merge pull request #344 from fastogt/master Eric Haszlakiewicz 2017-08-21 20:39:11 -05:00
• ef7b08ce7f Clamp double to int32 when narrowing in json_object_get_int. Kurt Schwehr 2017-08-08 07:54:38 -07:00
• e0e34f0a13 Fix 'make distcheck' László Várady 2017-08-04 12:26:54 +02:00
• db8dbbf371 Fix 'make dist' László Várady 2017-08-04 11:59:14 +02:00
• 0a99e7a5c1 Fix Mingw build topilski 2017-07-30 07:37:17 +03:00
• 65884f4d9e Fix parsing doubles for mingw topilski 2017-07-30 07:30:05 +03:00
• af87944585 PR #336: fix to previous change, be sure to include string.h when we're using the real strerror. Eric Haszlakiewicz 2017-07-27 20:17:25 -07:00
• 36dbe2d74e PR #336: Fix typo in defining STRERROR_OVERRIDE_IMPL Eric Haszlakiewicz 2017-07-27 20:10:53 -07:00