json-c

mirror/json-c

Fork 0

mirror of https://github.com/json-c/json-c.git synced 2026-03-19 13:09:07 +08:00

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

9ed00a694b Fill in a few more pre-release steps to match what we've done for the 0.14 release. Move the list of contributors to the AUTHORS file. Eric Haszlakiewicz 2020-04-19 01:28:24 +00:00
4badbe9c20 Rewrite the issued_closed_for_* files so they display a bit nicer. Eric Haszlakiewicz 2020-04-18 03:22:52 +00:00
0a95f98b8d Explicitly mark several things in json_tokener deprecated. Eric Haszlakiewicz 2020-04-18 02:42:46 +00:00
ecb9354bb1 Re-do clang-format. Eric Haszlakiewicz 2020-04-18 02:14:13 +00:00
23ddcbd4da Make json_abort() internal to json_object.c Eric Haszlakiewicz 2020-04-18 02:05:37 +00:00
5cc11289b4 Make json_tokener_validate_utf8() internal to json_tokener.c, and improve the docs a bit. Eric Haszlakiewicz 2020-04-18 02:02:06 +00:00
4dc0f1718e Merge pull request #582 from dota17/list_closed_issue_pr Eric Haszlakiewicz 2020-04-17 13:32:17 -04:00
4313465f25 update dota17 2020-04-17 09:40:24 +08:00
8bdb420d0f manual adjustment dota17 2020-04-16 16:30:14 +08:00
6bf6a9e248 add the list of issues& prs closed dota17 2020-04-16 16:15:04 +08:00
a9114392b4 Merge pull request #524 from dota17/addTestCase_obj_token Eric Haszlakiewicz 2020-04-15 23:35:21 -04:00
04bb0fca73 Merge pull request #581 from Jehan/wip/Jehan/no-strict-prototypes-windows Eric Haszlakiewicz 2020-04-15 23:32:59 -04:00
b14363ae32 remove unsuitable case dota17 2020-04-15 20:06:12 +08:00
8c33d1c3c9 CMakeLists: do not enforce strict prototypes on Windows. Jehan 2020-04-15 13:01:09 +02:00
7fb8d56458 Merge pull request #580 from besser82/topic/besser82/fix_cmake_tests Eric Haszlakiewicz 2020-04-14 15:17:21 -04:00
053eaa61d7 Fix CMake tests for enforced strict prototypes. Björn Esser 2020-04-14 20:42:32 +02:00
ab5425a6a6 Merge pull request #527 from dota17/arraylist_test Eric Haszlakiewicz 2020-04-14 10:28:16 -04:00
511edb51a4 Merge pull request #579 from besser82/topic/besser82/strict-prototypes Eric Haszlakiewicz 2020-04-14 10:25:13 -04:00
2876fcc137 clang-format two test_util_file.c and test_object_iterator.c dota17 2020-04-14 10:15:27 +08:00
8096125618 Increased the test coverage of json_util.c from 76% to 90.3%. chenguoping 2020-01-03 10:17:05 +08:00
f56c5c1a60 Increased the test coverage of json_object_iterator.c from 0% to 100% chenguoping 2020-01-03 10:05:09 +08:00
74bbe349c4 clang-format test1.c dota17 2020-04-14 09:20:51 +08:00
110c60fcdd fix valgrind errors chenguoping 2020-01-03 16:56:43 +08:00
76e1472808 testcase for array_list chenguoping 2020-01-02 19:30:00 +08:00
d0dc3489dc Enforce strict prototypes. Björn Esser 2020-04-13 11:29:52 +02:00
4742a2ab1d Merge pull request #578 from besser82/topic/besser82/pkgconfig_install Eric Haszlakiewicz 2020-04-12 20:52:01 -04:00
165e6f58fc CMake: Install pkgconfig file in proper location by default Björn Esser 2020-04-12 19:21:54 +02:00
8269f90956 Merge pull request #577 from besser82/topic/besser82/json_c_version_test_verbose_on_fail Eric Haszlakiewicz 2020-04-11 22:35:40 -04:00
5e699f7f73 Be verbose on failing json_c_version test. Björn Esser 2020-04-11 21:09:31 +02:00
c58d56ab7c Merge pull request #576 from besser82/topic/besser82/increase_coverage Eric Haszlakiewicz 2020-04-11 14:45:45 -04:00
d52f1ff2c1 Merge pull request #575 from besser82/topic/besser82/cosmetics Eric Haszlakiewicz 2020-04-11 14:18:37 -04:00
d47fb12e85 Test coverage for json_c_version. Björn Esser 2020-04-11 12:29:36 +02:00
73a2ed115a Remove multiple trailing newlines at EOF. Björn Esser 2020-04-11 10:34:30 +02:00
fd0ae5aba6 gitignore: Add build folder. Björn Esser 2020-04-10 13:10:30 +02:00
78cd37fb18 Clean trailing white-space. Björn Esser 2020-04-10 13:06:54 +02:00
37355cf0e6 Fix line terminators to be UNIX. Björn Esser 2020-04-10 13:25:41 +02:00
270dc2f999 Update README.md to remove autoconf instructions in favor of cmake. Eric Haszlakiewicz 2020-04-11 03:24:51 +00:00
0734c5303d Merge pull request #572 from besser82/topic/besser82/cmake_fixes Eric Haszlakiewicz 2020-04-10 22:08:27 -04:00
69ceb38f2f Merge pull request #573 from besser82/topic/besser82/coverage Chen 2020-04-11 09:31:43 +08:00
0dac15c1ca Fix coveralls submission. Björn Esser 2020-04-10 15:08:09 +02:00
e756777c92 CMake: Check whether BSYMBOLIC is supported by the linker. Björn Esser 2020-04-10 14:42:03 +02:00
58670ec64e CMake: Build Doxygen documentation out-of-tree. Björn Esser 2020-04-10 14:20:57 +02:00
a989651bd4 CMake: Fix appending of linker flags. Björn Esser 2020-04-10 14:15:52 +02:00
61392c867f List the set of contributors since the 0.13 branch Eric Haszlakiewicz 2020-04-10 02:11:48 +00:00
0a070ef312 Fix one more assert("!invalid cint_type") to use json_abort(...) instead. Eric Haszlakiewicz 2020-04-10 01:26:04 +00:00
545464322b Issue #568: fix the strtoll and strtoull handing so config.h ends up creating defines for those only when needed, which should exclude mingw environments. Eric Haszlakiewicz 2020-04-09 20:58:28 +00:00
b64bdfe381 Remove autoconf files from .gitignore. Eric Haszlakiewicz 2020-04-09 02:55:21 +00:00
0c60125211 Update the oss-fuzz build script to try to get it to work with cmake. Eric Haszlakiewicz 2020-04-09 02:34:59 +00:00
95737df9d4 Remove autoconf machinery, we're using cmake now. Update the release checklist to account for that, plus fill in other tasks and clean it up a bit. Eric Haszlakiewicz 2020-04-09 02:15:31 +00:00
96ab2f6596 osx builds also need -DDISABLE_BSYMBOLIC=ON Eric Haszlakiewicz 2020-04-08 03:04:27 +00:00
96bb334650 I have NFC why osx fails when "set -e" is in effect, but leave it off and clean up the rest of the debuging code in the travis config. Eric Haszlakiewicz 2020-04-08 02:54:10 +00:00
f357081b57 Not all systems (e.g. osx) have malloc.h, include stdlib.h instead. Eric Haszlakiewicz 2020-04-08 02:53:48 +00:00
2782a6b62c Try yet again to fix the osx build, this time do set +e Eric Haszlakiewicz 2020-04-08 02:39:03 +00:00
a86ae1df9a Another attempt at debugging the travis osx build, this time just ignore errors. Eric Haszlakiewicz 2020-04-08 02:28:02 +00:00
829e0829dd Wait a while before exiting travis to allow output to flush. Eric Haszlakiewicz 2020-04-08 02:17:14 +00:00
cf8421c36d Apparently cmake is already installed on travis osx builds. Try another approach to figure out what was failing. Eric Haszlakiewicz 2020-04-08 02:02:25 +00:00
fb0b653612 Install cmake on osx travis builds. s/make check/make test/ Eric Haszlakiewicz 2020-04-08 01:45:49 +00:00
a3b82cbc77 Perform the travis build in a subdir, so the distcheck target works. Eric Haszlakiewicz 2020-04-08 01:34:22 +00:00
677a8ccf44 Switch travis to use cmake instead of autoconf. Eric Haszlakiewicz 2020-04-08 01:21:11 +00:00
19bbf2c069 Add includes and split off json_types.h to help ensure that headers can be included in any order. Eric Haszlakiewicz 2020-04-06 13:55:27 +00:00
5e19c26cae Don't let clang-format rearrange Windows includes, since they need to be in a particular order. Eric Haszlakiewicz 2020-04-06 02:47:34 +00:00
9acc4e9d71 Format random_seed.c with clang-format, with key asm sections excluded. Eric Haszlakiewicz 2020-04-06 01:52:28 +00:00
9a494081cb Update the style guide to mention that we're using clang-format now. Eric Haszlakiewicz 2020-04-06 01:49:14 +00:00
31f1ab2be1 Merge pull request #555 from dota17/chang_format_3 Eric Haszlakiewicz 2020-04-03 00:13:34 -04:00
8b162c4b89 clang-format the files dota17 2020-03-28 10:25:00 +08:00
c117d8a8a8 add the disabling formatting coments and adjust the partial code manuly dota17 2020-03-27 13:04:50 +08:00
a8cec740f0 add options dota17 2020-03-10 15:47:53 +08:00
df7833e9a3 clang-format dota17 2020-03-06 17:15:05 +08:00
ed54353d84 Merge pull request #563 from robybeen/master Eric Haszlakiewicz 2020-04-02 22:35:21 -04:00
5d9b8e0fef Changed order of calloc args to match stdlib (2) Robert 2020-04-02 19:28:55 +02:00
56f81811c2 Changed order of calloc args to match stdlib Robert 2020-04-02 19:23:10 +02:00
6afcf1606b Merge pull request #562 from dota17/testcase_add Eric Haszlakiewicz 2020-04-02 11:23:39 -04:00
3822177473 add test cases dota17 2020-03-30 17:32:06 +08:00
c2ba379b03 Merge pull request #561 from dota17/add_badge Chen 2020-03-31 10:54:45 +08:00
203bacb24d add the badge in README.md and test the coveralls dota17 2020-03-30 15:43:50 +08:00
d1650a582e Merge pull request #541 from dota17/coveralls_final Chen 2020-03-28 10:42:17 +08:00
541a0b609a modify the coveralls configuration file dota17 2020-02-19 18:13:28 +08:00
353ef26bda Merge pull request #558 from dota17/doc_message_modify Chen 2020-03-20 11:17:20 +08:00
1204a1fded modify the doc target message dota17 2020-03-19 10:23:29 +08:00
a06339215e Merge pull request #556 from Jehan/wip/Jehan/fix-broken-mingw-w64 Eric Haszlakiewicz 2020-03-16 21:24:14 -05:00
b15e7ba470 Fixes various Wreturn-type and Wimplicit-fallthrough errors on Mingw-w64 Jehan 2020-03-15 23:29:37 +01:00
e94eb90f9f Merge pull request #546 from dota17/make_unistall Eric Haszlakiewicz 2020-03-10 22:12:13 -05:00
c14c6caa32 delete -r in uninstall dota17 2020-03-11 10:47:04 +08:00
a8c9284f06 Merge pull request #547 from dota17/assert_test Eric Haszlakiewicz 2020-03-03 07:54:21 -06:00
0030e905b4 modify RELEASE dota17 2020-03-03 14:16:13 +08:00
e56ab0146f update testcase and delete debug -O0 build dota17 2020-03-02 20:19:35 +08:00
b3296e778f Follow up the PR#542: improve assert() calls, simplify code in json_object_equal(). Eric Haszlakiewicz 2020-03-02 02:08:49 +00:00
737aee40c4 Merge pull request #542 from dota17/adduint64_final Eric Haszlakiewicz 2020-03-01 08:51:26 -05:00
2d44f865c3 modify json-c default build type, and fix up the assert() errors in testcase dota17 2020-02-29 15:32:42 +08:00
6359b79847 update json_object.c and testcase, delete json_object_uint_inc() dota17 2020-02-28 11:18:48 +08:00
9532f94fa4 modify partial functions and testcase, in order to support automatic conversion for int64/uint64 dota17 2020-02-27 15:01:06 +08:00
1160c8625c Add uninstall target in cmake dota17 2020-02-27 16:00:09 +08:00
c816de212b modify the json_object, replace c_int64/c_uint64 with struct{union{int64, uint64},...} dota17 2020-02-26 20:54:36 +08:00
30e00cf757 Merge pull request #545 from dota17/make_doc Eric Haszlakiewicz 2020-02-26 20:56:22 -05:00
e3b6521baa add doc target on cmake dota17 2020-02-26 15:39:27 +08:00
5a2b9139f9 Merge pull request #544 from dota17/distcheck Eric Haszlakiewicz 2020-02-25 21:48:35 -05:00
a0129c9761 Merge pull request #543 from dota17/readme Eric Haszlakiewicz 2020-02-25 21:38:18 -05:00
77d7a99c75 Increase distcheck target in cmake dota17 2020-02-21 12:16:51 +08:00
0ccb296263 Update README.md Chen 2020-02-25 16:20:41 +08:00
f69fbd897b Added documentation for camke-configure dota17 2020-02-25 15:01:05 +08:00