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

• 5fd99e62ed Merge pull request #273 from konoal/master Eric Haszlakiewicz 2016-09-28 08:08:01 -04:00
• 5653bc61a4 Merge pull request #274 from pepevel/master Eric Haszlakiewicz 2016-09-28 08:05:50 -04:00
• 0df34b4c96 Support for 64 bit pointers on Windows pepevel 2016-09-27 20:12:03 +01:00
• b2fbf93df0 fixed wrong object name in json_object_all_values_equal Alexey Konovalov 2016-09-27 11:20:49 +03:00
• c5c93724fe Changed CMake variables and adding output for debugging Steve Gerbino 2016-09-26 00:19:46 -04:00
• 0c749d96ea Target C99 standards to get rid of warnings Steve Gerbino 2016-09-26 00:09:55 -04:00
• 928858457b Modified the execute_process commands Steve Gerbino 2016-09-25 23:08:39 -04:00
• bdead39f63 Changed PROJECT_SOURCE_DIR to CMAKE_CURRENT_SOURCE_DIR to fix building when used as external project Steve Gerbino 2016-09-25 22:32:35 -04:00
• 702b42eaf3 Modified CMakeLists.txt to use autotools to generate configuration for Unix systems Steve Gerbino 2016-09-25 22:03:56 -04:00
• 43afcc0d99 Lowered CMake required version so that Travis CI is able to build, moved include folder to include/json-c to match the behavior of autotools Steve Gerbino 2016-09-25 18:49:34 -04:00
• fe941a26a3 Trailing slash seems necessary in the install command to get contents Steve Gerbino 2016-09-25 15:04:05 -04:00
• ab7c09dc8e Forget DESTINATION in CMake install command Steve Gerbino 2016-09-25 14:59:38 -04:00
• 34b4a490b1 We need to also install the generated configuration files Steve Gerbino 2016-09-25 14:57:15 -04:00
• 989e39d995 Fixed typo in CMakeList.txt FILES_MATCHING Steve Gerbino 2016-09-25 14:46:33 -04:00
• e2ee223dc2 Added install instructions for CMake Steve Gerbino 2016-09-25 14:42:14 -04:00
• 69f018c49e Resolves json-c/json-c#271 by adding MacOS configuration files and modifies CMakeLists.txt to use them Steve Gerbino 2016-09-25 02:14:57 -04:00
• fae09456ae json_object_set_boolean for upstream style check Stoian Ivanov 2016-09-21 01:31:00 +03:00
• 9f9c3326fe Merge pull request #267 from sixlettervariables/patch-1 Eric Haszlakiewicz 2016-09-12 18:19:26 -04:00
• 21e5ffbcf8 Removes me as a maintainer, because I'm not. Christopher Watford 2016-09-12 14:18:21 -04:00
• ea1499a372 Issue #263: add const so the prototype for json_object_object_add_ex() matches the definition. Eric Haszlakiewicz 2016-08-24 23:41:22 -04:00
• c5b5a984cd Add Cmakefile Randy Armstrong 2016-08-24 00:16:13 -07:00
• 0fcf1d1ae7 Fix memory leak and inconsistent output (due to varying fd numbers) in test_util_file. Eric Haszlakiewicz 2016-08-20 23:06:22 -04:00
• 5fccfed4f4 Issue #260: add a check to prevent trivial loops in the object tree, even though it is up to the callers to avoid doing so in more complex cases. Eric Haszlakiewicz 2016-08-20 22:41:49 -04:00
• c4d060bf80 json_object_object_add_ex() should have shared code with json_object_object_add(), and been changed to return int at the same time the latter was. Do that now. Also correct a couple of calls to _to_json_string to check the return value. Eric Haszlakiewicz 2016-08-20 22:35:29 -04:00
• e40505e489 Merge branch 'RyDroid-tests' Eric Haszlakiewicz 2016-08-13 09:17:25 -04:00
• 61cd433131 Merge branch 'tests' of https://github.com/RyDroid/json-c into RyDroid-tests Eric Haszlakiewicz 2016-08-13 09:17:01 -04:00
• e076ae756d Merge pull request #251 from RyDroid/editorconfig Eric Haszlakiewicz 2016-08-13 08:31:57 -04:00
• 8215c0ac0e Very minor changes to some tests Nicola Spanti (RyDroid) 2016-08-08 15:11:19 +02:00
• b222d4386e Adding a file for EditorConfig Nicola Spanti (RyDroid) 2016-08-07 18:20:59 +02:00
• 4d62de3898 Revert bogus change to json_object_get() made in f40b08d8 that caused it to always return NULL. (Issue #259) Also undo NULL check in json_tokener_set_flags(): it's not at all valid toi try to set flags on a NULL pointer, and doing so should not be silently ignored. Eric Haszlakiewicz 2016-08-11 17:03:16 -04:00
• 0ad87649d4 Merge pull request #255 from RyDroid/minor-c2 Eric Haszlakiewicz 2016-08-10 15:06:30 -04:00
• 9f9a9ac426 Merge pull request #252 from RyDroid/minor-no-c Eric Haszlakiewicz 2016-08-09 07:39:27 -04:00
• 71d0615e98 Merge branch 'jobol-issue-165' Eric Haszlakiewicz 2016-08-09 07:38:18 -04:00
• f3db59d990 Merge branch 'issue-165' of https://github.com/jobol/json-c into jobol-issue-165 Eric Haszlakiewicz 2016-08-09 07:36:54 -04:00
• bc3e691a1e Merge pull request #253 from RyDroid/cppcheck-travis Eric Haszlakiewicz 2016-08-08 22:57:56 -04:00
• 51b011ce24 Merge pull request #249 from RyDroid/readme Eric Haszlakiewicz 2016-08-08 22:53:33 -04:00
• d758f4a8a7 Add a brief style guide. Address Issue #257. Eric Haszlakiewicz 2016-08-08 22:50:23 -04:00
• 33ae9f5d44 Merge pull request #250 from RyDroid/gitignore Eric Haszlakiewicz 2016-08-08 18:42:01 +00:00
• ab1d761865 Improving .gitignore Nicola Spanti (RyDroid) 2016-08-07 18:24:53 +02:00
• f2e7dda910 Improving README Nicola Spanti (RyDroid) 2016-08-07 18:29:11 +02:00
• 36b4003118 Adding a test with cppcheck for Travis CI Nicola Spanti (RyDroid) 2016-08-08 15:23:27 +02:00
• f40b08d8f0 Minor changes in C source code Nicola Spanti (RyDroid) 2016-08-08 15:20:41 +02:00
• 250a3987cf Very minor changes not related to C source code Nicola Spanti (RyDroid) 2016-08-08 15:12:44 +02:00
• 9688f343a5 Issue #246: Include xlocale.h too, to get locale_t defined, since not all OSes include that in locale.h Eric Haszlakiewicz 2016-08-02 22:25:05 -04:00
• 1fceb2207a test: add test of 'json_object_to_json_string_length' José Bollo 2016-08-01 15:04:54 +02:00
• fa76e4a8c9 Issue #195: Actually call uselocale() in the new locale handling code in json_tokener. Also, be sure the right locale_t is freed if we fail on the second uselocale. Finally, fix test_locale so it *doesn't* use json_object_to_json_string as that will simple re-emit the original parsed string values. Eric Haszlakiewicz 2016-07-31 14:39:56 -04:00
• 4091b9c87e Issue #195: use uselocale() instead of setlocale() in json_tokener to behave better in threaded environments. Eric Haszlakiewicz 2016-07-30 21:34:58 -04:00
• 7d637362b7 Linux's %p format doesn't return "0x0" for NULL pointers, so switch to using %lx for consistency. Eric Haszlakiewicz 2016-07-30 15:09:51 -04:00
• deb9fa482d Issue #240: add arbitrary use of val's in foreach loops to squash warnings about unused variables. Eric Haszlakiewicz 2016-07-30 18:27:53 +00:00
• 344009bf26 Add method 'json_object_to_json_string_length' jobol 2016-07-26 19:22:25 +02:00
• 54ae254537 Fix a compiling error José Bollo 2016-07-27 14:42:25 +02:00
• b366750e11 Merge pull request #239 from ploxiln/printbuf_empty Eric Haszlakiewicz 2016-07-16 13:49:08 -04:00
• 868b20ce4e initialize null terminator of new printbuf Pierce Lopez 2016-07-16 00:30:31 -04:00
• 2b255d0ebf Fix absolute paths in test_util_file that vary depending on where it is run. Eric Haszlakiewicz 2016-06-27 04:29:07 +00:00
• b1d65b62db Issue #113: Add more files to EXTRA_DIST and a dist-hook to get distcheck to at least not fail. Eric Haszlakiewicz 2016-06-27 04:28:34 +00:00
• 1071385896 Issue #113: add "new" files to appropriate variables in Makefile, and note the need to run "make distcheck" as part of the release process. Fix issues with the test script so it works under distcheck too. Eric Haszlakiewicz 2016-06-27 03:46:38 +00:00
• 29005ef7b1 Merge pull request #238 from nagamalli9999/master Eric Haszlakiewicz 2016-06-26 23:09:42 -04:00
• 29ef73f21d Issue #189: Eliminate use of MC_ERROR from json_util.c, and add a json_util_get_last_err() function to retrieve the error for those callers that care about it. Add tests and descriptions for the functions in json_util.c Eric Haszlakiewicz 2016-06-26 02:20:05 +00:00
• 78cf6e63ff linkhash.h: removed redundant params from comments Eswar Yaganti 2016-06-25 23:05:41 +05:30
• 5fb63a09f9 linkhash.c: optimised the table_free path Eswar Yaganti 2016-06-25 22:50:36 +05:30
• 595891729e Issue #236: Add -Wcast-qual and fix casts to retain constness. To better distinguish between entry->k and entry->v being const within linkhash, but non-const outside, add lh_entry_v() and lh_entry_k() accessors. Make lh_entry->k const. Eric Haszlakiewicz 2016-06-11 18:18:46 +00:00
• f285c0a2e5 Issue #175: disable the fast-and-loose code in hashlittle() when running with AddressSanitizer. Eric Haszlakiewicz 2016-06-08 03:24:59 +00:00
• ae66b24369 Mention that we're aiming to follow RFC 7159 now. Cause README.md to show up in Doxygen output as the main page. Eric Haszlakiewicz 2016-06-08 02:36:13 +00:00
• 40de3c67cd Merge pull request #232 from NeoRaider/size_t2 Eric Haszlakiewicz 2016-06-07 16:47:40 -04:00
• d13cfe10f6 tests/tests1: fix printf format for size_t arguments Matthias Schiffer 2016-06-07 10:49:42 +02:00
• b547ee0f35 Update the index page to point at the 0.12.1 release. Eric Haszlakiewicz 2016-06-07 04:16:05 +00:00
• 17f306188f Add the 0.12.1 release docs to gh-pages. Eric Haszlakiewicz 2016-06-07 04:14:43 +00:00
• a42caac805 Copy over note about the 0.12.1 release to the master branch. Eric Haszlakiewicz 2016-06-07 04:13:15 +00:00
• acbcc062f9 Add doxygen-generated docs for the 0.12.1 release. json-c-0.12.1-20160607 Eric Haszlakiewicz 2016-06-07 04:05:03 +00:00
• ef2240098d Update release version to 0.12.1 and generate configure script. Eric Haszlakiewicz 2016-06-07 03:37:31 +00:00
• 0539191d18 Check the __GCC_HAVE_SYNC_COMPARE_AND_SWAP_{2,4,8} defines to decide whether to use __sync_val_compare_and_swap(), as described at https://gcc.gnu.org/onlinedocs/cpp/Common-Predefined-Macros.html Also, fix the types of the variables when building on Windows. Also, should address issue #214. Eric Haszlakiewicz 2016-06-07 03:26:46 +00:00
• 1eb5a700f9 Merge pull request #230 from ebassi/master Eric Haszlakiewicz 2016-06-06 22:59:38 -04:00
• e61eb409fd Merge pull request #233 from NeoRaider/size_t3 Eric Haszlakiewicz 2016-06-06 22:55:44 -04:00
• ce7ad480f4 Merge pull request #234 from NeoRaider/userdata Eric Haszlakiewicz 2016-06-06 22:54:40 -04:00
• 0e1a057449 Remove reference to svn.metaparadigm.com Michael Clark 2016-06-07 08:11:16 +12:00
• f87e378d48 Add public API to get and set userdata Matthias Schiffer 2016-05-29 05:54:57 +02:00
• c2b004ba0e Make default double serializer ignore userdata again Matthias Schiffer 2016-05-29 04:54:38 +02:00
• 22fdcfc71a Include stddef.h in json_object.h Matthias Schiffer 2016-05-29 05:19:50 +02:00
• 28c1ca1240 Use stdint.h to check for size_t size Emmanuele Bassi 2016-05-23 10:18:59 +01:00
• 7ae5c3f7a6 Issue #142: un-deprecate json_object_object_get(), but note why you might want to use json_object_object_get_ex() instead. Eric Haszlakiewicz 2016-05-23 03:02:34 +00:00
• 5e4e5f7d9d Issue #205: use _strdup instead of strdup on Windows. Eric Haszlakiewicz 2016-05-23 02:37:09 +00:00
• f4ca1325ae Merge branch 'doctaweeks-fixes-for-upstream' Eric Haszlakiewicz 2016-05-23 02:12:51 +00:00
• 996be85843 Fix a few places that needed adjustment for the size_t changes, including updating the range checks to use a calculated SIZE_T_MAX. Eric Haszlakiewicz 2016-05-23 02:10:58 +00:00
• 9a2915ce66 Merge branch 'fixes-for-upstream' of https://github.com/doctaweeks/json-c into doctaweeks-fixes-for-upstream Eric Haszlakiewicz 2016-05-23 02:08:28 +00:00
• b2c5969aff Merge pull request #193 from jplitza/master Eric Haszlakiewicz 2016-05-18 16:10:27 -04:00
• 21dc5dc92b Export json_object_double_to_json_string() and use custom format string Jan-Philipp Litza 2016-05-06 16:12:44 +02:00
• 2200ffa8b0 Fix code in docs for json_object_new_double_s() Jan-Philipp Litza 2016-05-06 16:12:19 +02:00
• 3345b25962 Add tests for the json_object_array_del_idx() function. Eric Haszlakiewicz 2016-04-30 19:09:45 +00:00
• 9edf2418e0 Merge branch 'Protovision-master' Eric Haszlakiewicz 2016-04-30 18:53:16 +00:00
• 1fb87cd196 Merge branch 'master' of https://github.com/Protovision/json-c into Protovision-master Eric Haszlakiewicz 2016-04-30 18:52:47 +00:00
• e3fb74942a Merge pull request #216 from Jehan/master Eric Haszlakiewicz 2016-04-30 14:45:16 -04:00
• c6a97eb9ce Merge pull request #218 from sevan/patch-1 Eric Haszlakiewicz 2016-04-30 14:44:29 -04:00
• 82bdbdba24 Merge pull request #219 from rouault/low_heap_robustness_fixes Eric Haszlakiewicz 2016-04-30 14:44:05 -04:00
• 4e0c8b55fb Merge pull request #220 from hschaa/master Eric Haszlakiewicz 2016-04-30 14:42:16 -04:00
• afa9f824e7 Merge pull request #222 from chenha0/master Eric Haszlakiewicz 2016-04-30 14:40:30 -04:00
• 02a2151b2b Merge pull request #223 from minaguib/master Eric Haszlakiewicz 2016-04-30 14:36:02 -04:00
• 138c2a6b97 Clarify json_object_get_string documentation of NULL handling & returning Mina Naguib 2016-02-07 20:55:25 -05:00
• dffdee966f Fix issue #221: JSON_C_TO_STRING_NOSLASHESCAPE works incorrectly chenha0 2016-01-21 20:11:40 +08:00
• dec5fcd50b Add some basic tests for verifying json_object_equal behavior Helmut Schaa 2016-01-13 15:40:08 +01:00
• 00e475c434 Add utility function for comparing json_objects Helmut Schaa 2016-01-13 15:40:02 +01:00