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-c-0.19

json_object-split

master

reltools

travis-debug

#104

#104/merge

#105

#105/merge

#106

#106/merge

#107

#109

#11

#11/merge

#112

#113

#113/merge

#119

#119/merge

#12

#12/merge

#121

#123

#124

#124/merge

#125

#125/merge

#126

#126/merge

#127

#127/merge

#128

#128/merge

#132

#133

#141

#144

#145

#145/merge

#148

#148/merge

#149

#150

#151

#153

#155

#156

#16

#16/merge

#162

#162/merge

#163

#164

#164/merge

#168

#171

#174

#177

#179

#18

#180

#182

#183

#184

#184/merge

#186

#19

#19/merge

#191

#193

#194

#194/merge

#196

#198

#199

#20

#20/merge

#200

#208

#208/merge

#209

#21

#21/merge

#210

#211

#211/merge

#216

#218

#219

#220

#222

#223

#23

#23/merge

#230

#231

#231/merge

#232

#233

#234

#238

#239

#24

#24/merge

#241

#241/merge

#243

#248

#248/merge

#249

#25

#25/merge

#250

#251

#252

#253

#254

#255

#26

#26/merge

#262

#262/merge

#267

#27

#27/merge

#272

#273

#274

#277

#282

#282/merge

#283

#285

#287

#288

#288/merge

#289

#29

#29/merge

#290

#290/merge

#294

#294/merge

#299

#30

#30/merge

#303

#305

#31

#31/merge

#310

#311

#312

#319

#32

#32/merge

#321

#325

#328

#329

#33

#33/merge

#330

#331

#331/merge

#333

#335

#336

#34

#34/merge

#340

#344

#345

#346

#354

#354/merge

#355

#355/merge

#359

#360

#361

#362

#362/merge

#363

#365

#37

#37/merge

#372

#373

#38

#38/merge

#381

#383

#383/merge

#384

#386

#387

#388

#389

#390

#391

#392

#393

#399

#4

#4/merge

#402

#410

#415

#42

#42/merge

#420

#421

#428

#431

#432

#433

#433/merge

#434

#436

#44

#44/merge

#441

#443

#443/merge

#444

#45

#45/merge

#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/merge

#510

#511

#512

#514

#515

#516

#517

#519

#52

#52/merge

#522

#523

#524

#525

#526

#527

#528

#529

#530

#531

#533

#536

#537

#538

#541

#542

#543

#544

#545

#546

#547

#55

#55/merge

#551

#553

#555

#556

#558

#56

#56/merge

#561

#562

#563

#564

#565

#566

#567

#568

#571

#572

#573

#575

#576

#577

#578

#579

#58

#58/merge

#580

#581

#582

#583

#583/merge

#584

#585

#587

#589

#59

#59/merge

#590

#591

#592

#595

#597

#6

#6/merge

#60

#60/merge

#602

#603

#606

#607

#608

#609

#61

#61/merge

#610

#611

#612

#613

#614

#617

#618

#619

#62

#62/merge

#620

#622

#624

#625

#626

#627

#628

#629

#632

#633

#634

#639

#64

#640

#646

#648

#65

#65/merge

#650

#651

#653

#655

#656

#657

#659

#66

#66/merge

#660

#661

#662

#663

#664

#665

#667

#669

#670

#671

#673

#674

#675

#679

#680

#680/merge

#689

#694

#696

#7

#7/merge

#70

#70/merge

#700

#701

#702

#703

#704

#706

#71

#71/merge

#714

#715

#715/merge

#716

#717

#718

#722

#724

#726

#727

#728

#729

#73

#73/merge

#732

#734

#735

#737

#739

#740

#740/merge

#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/merge

#781

#782

#783

#784

#789

#790

#794

#796

#8

#8/merge

#80

#80/merge

#802

#803

#804

#805

#805/merge

#810

#813

#822

#825

#826

#827

#828

#831

#832

#832/merge

#834

#835

#837

#839

#845

#846

#847

#849

#852

#858

#859

#860

#861

#864

#866

#871

#872

#873

#877

#878

#879

#88

#88/merge

#882

#883

#884

#888

#89

#89/merge

#890

#890/merge

#893

#895

#898

#899

#90

#90/merge

#900

#901

#903

#904

#905

#906

#907

#908

#910

#913

#915

#917

#924

#925

#93

#93/merge

#930

#931

#932

#933

#935

#936

#937

#939

#94

#94/merge

#940

#942

#943

#945

#946

#948

#949

#95

#95/merge

#950

#951

#952

#953

#955

#957

#958

#96

#96/merge

#960

#961

#962

#963

#964

#965

#966

#967

#968

#969

#97

#97/merge

#970

#971

#973

#974

#975

#976

#977

#978

#979

#980

#981

#982

#982/merge

#983

#983/merge

#985

#986

#987

#987/merge

#988

#989

#989/merge

#990

#991

#992

#992/merge

#993

#993/merge

#994

#994/merge

#996

#996/merge

#998

#998/merge

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

json-c-0.19-20260627

Mono Color

• 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
• 77a4276a8c Fix various potential null ptr deref and int32 overflows Even Rouault 2016-01-11 12:15:54 +01:00
• 7150b7f28d Use a macro to indicate C99 to the compiler Sevan Janiyan 2016-01-05 11:43:17 +00:00
• 79c99aeb2b configure: check realloc with AC_CHECK_FUNCS() to fix cross-compilation. Jehan 2016-01-01 18:35:14 +01:00
• 537f8bcbdb Add const qualifiers to several functions that don't modify the json_object. Eric Haszlakiewicz 2015-12-26 21:42:18 +00:00
• 882b7d95cc Issue #137: remove config.h.in from change control. Eric Haszlakiewicz 2015-12-08 21:20:42 -06:00
• 980cdd61be Merge commit '2be921d88376e78f84d79aafa6db2714da804e59' Eric Haszlakiewicz 2015-12-08 20:51:06 -06:00
• 65be8275da Merge pull request #209 from rgerhards/fix-regression Eric Haszlakiewicz 2015-11-29 21:24:50 -05:00
• 316da85818 Fix issue #201: add a JSON_C_TO_STRING_NOSLASHESCAPE flag to turn off escaping of forward slashes. Eric Haszlakiewicz 2015-11-28 20:00:30 -06:00
• 5a6a378725 Merge pull request #198 from unmole/master Eric Haszlakiewicz 2015-11-28 13:58:07 -05:00
• 7e98ed93f4 subtract first, then retrieve value Emiel Bruijntjes 2015-11-28 14:19:43 +01:00
• 9d85367679 added tabs instead of spaces to be compatible with rest of code Emiel Bruijntjes 2015-11-27 16:53:57 +01:00
• 827f0fd8ef update indentation Emiel Bruijntjes 2015-11-27 16:52:17 +01:00
• 23ee243113 reference increment and decrement is now atomic (when using a GCC compatible compiler), which allows passing json objects between threads Emiel Bruijntjes 2015-11-27 16:49:32 +01:00
• 92e9a5032b Use size_t for json object array ops Daniel M. Weeks 2014-08-22 12:16:45 -04:00
• 45c56b80c4 Use size_t for array list length and size Daniel M. Weeks 2014-08-22 10:56:59 -04:00
• 36610fb697 fix regression from 2d549662be Rainer Gerhards 2015-11-19 11:05:15 +01:00
• c97bbd3797 Merge pull request #199 from Nzbuu/fix_vs_build Eric Haszlakiewicz 2015-11-14 23:31:15 -05:00
• b82a51a5cd Merge pull request #200 from Nzbuu/ci_build Eric Haszlakiewicz 2015-11-14 23:30:38 -05:00
• 239c146a4b Appveyor: Visual Studio v140 no longer fails James Myatt 2015-11-05 13:50:30 +00:00
• fd43c2b99a Appveyor: Create artefact with library and include files only James Myatt 2015-11-05 13:41:42 +00:00
• 80c1f69b9e Use AX_APPEND_COMPILE_FLAGS() to check the various compile flags, such as -Wall, to ensure the compile supports. Eric Haszlakiewicz 2015-10-23 02:16:40 +00:00
• 10d50aadf2 Remove the AC_FUNC_MALLOC check, since we don't depend on the malloc(0) behavior it checks for, and we don't provide a rpl_malloc() implementation anyway. Eric Haszlakiewicz 2015-10-22 02:57:13 +00:00
• 82030cd0af Travis: add osx and clang builds James Myatt 2015-10-09 23:50:51 +01:00
• 88dedb8824 Travis: skip install step James Myatt 2015-10-09 23:48:06 +01:00
• f786feac0a Add Travis build script James Myatt 2015-10-09 23:46:19 +01:00
• 17e11e2c92 Appveyor: Allow failing builds against newest toolset James Myatt 2015-09-11 13:03:36 +01:00
• f6f8436e97 Add initial version of Appveyor build script James Myatt 2015-09-11 12:20:44 +01:00
• 3f012eb0f8 Fix build in Visual Studio James Myatt 2015-10-09 23:24:55 +01:00
• 467102fa78 Remove superfluous NULL checks Anmol Sarma 2015-10-01 14:14:03 +05:30
• f37b0a10a5 Fix possible memory leak Anmol Sarma 2015-10-01 14:09:09 +05:30
• 12916e229c Merge pull request #196 from rgerhards/improve-performance Eric Haszlakiewicz 2015-09-28 22:25:29 -04:00
• c4f8cc34df more efficient handling for smalls strings inside json_object Rainer Gerhards 2015-09-23 15:56:48 +02:00
• 1ae4b50bde remove unneeded data items from hashtable code Rainer Gerhards 2015-09-23 12:40:57 +02:00
• 8f8d03df46 add perllike hash function for strings Rainer Gerhards 2015-09-23 11:12:13 +02:00
• 2d549662be add json_object_object_add_ex() API Rainer Gerhards 2015-09-23 09:08:49 +02:00
• d8e44dc685 reduce duplicate hash computation in json_object_object_add() Rainer Gerhards 2015-09-22 19:07:30 +02:00
• 1757a31750 Fix doc for json_object_new_boolean() to indicate the correct value for TRUE (1). Eric Haszlakiewicz 2015-08-23 00:08:14 -04:00
• d4f8f92eb0 Squash deprecated function warning by replacing json_object_object_get calls with json_object_object_get_ex in test_cast. Eric Haszlakiewicz 2015-08-23 00:06:36 -04:00
• 93b1fe63e5 Add back in the __attribute__((__unused__)) that was lost in the previous commit. It's needed to squash a "variable 'val' set but not used" warning. Eric Haszlakiewicz 2015-08-22 23:59:49 -04:00
• a8bbefbbb4 Merge pull request #183 from cryogen/master Eric Haszlakiewicz 2015-08-22 15:24:26 -04:00
• 55530bfc0f Merge pull request #186 from Virtual-Instruments/master Eric Haszlakiewicz 2015-08-05 23:19:19 -04:00
• e8a302017f Syntax error Jacob Alexander 2015-06-02 13:59:50 -07:00
• b594c34f57 Merge pull request #174 from haata/master Eric Haszlakiewicz 2015-05-31 12:10:13 -07:00
• 92d4cf15f0 Adding JSON_C_TO_STRING_PRETTY_TAB flag Jacob Alexander 2015-03-23 16:34:30 -07:00
• cd8bd7f617 Tell the compiler we're intentionally ignoring the return value from __sync_val_compare_and_swap(). Eric Haszlakiewicz 2015-05-26 19:02:19 -07:00
• 75d7409c4e Fix uninitialised variable compile warning, and also fix unused-when-used warning Stuart Walsh 2015-03-31 12:23:03 +01:00
• cbedf2f7ca Merge pull request #149 from cicku/patch-2 Eric Haszlakiewicz 2015-05-09 21:35:22 -04:00
• e4fce5d6ae Merge pull request #171 from Nzbuu/vs2010_build Eric Haszlakiewicz 2015-05-08 21:31:37 -04:00
• 8ba19375d5 Merge pull request #177 from cryogen/json-c-0.12 Eric Haszlakiewicz 2015-05-08 21:20:54 -04:00
• e1eb298de1 Merge pull request #182 from tpetazzoni/libm-fix Eric Haszlakiewicz 2015-05-08 21:19:48 -04:00
• 82a1316f76 Merge pull request #180 from yegorich/silent Eric Haszlakiewicz 2015-05-08 21:19:05 -04:00
• 93582ad85e Link against libm when needed Thomas Petazzoni 2015-05-01 12:52:18 +02:00
• 36b0169ed6 Enable silent build by default Yegor Yefremov 2015-04-25 21:57:38 +02:00
• cdca9d3c8e Added array_list_del_idx and json_object_array_del_idx Mark Swoope 2015-04-02 14:05:27 -07:00
• 89ae583a86 Fix uninitialised variable compile warning, and also fix unused-when-used warning Stuart Walsh 2015-03-31 12:23:03 +01:00
• 736f4b3581 Build random_seed.c as well James Myatt 2015-02-05 16:38:47 +00:00
• 9d3d8d6fc0 Add x64 build configurations James Myatt 2015-02-05 16:15:06 +00:00
• e1a3f33a26 Set CompileAsCpp flag (Required for vs2010/winsdk71) Revert some project settings to defaults James Myatt 2015-02-05 16:12:28 +00:00
• d5baa0381f Update VS project to include current source files James Myatt 2015-02-05 16:02:58 +00:00
• 18b3c49296 Use more appropriate casts James Myatt 2015-02-05 15:59:19 +00:00
• bf32650c83 Add missing include file to random_seed James Myatt 2015-02-05 15:58:39 +00:00
• 720d566d03 Define macros from inttypes.h when not available James Myatt 2015-02-05 15:58:12 +00:00
• 9be71700eb json_tokener requires INF and NAN James Myatt 2015-02-05 15:57:14 +00:00
• 72310c87a5 Define INFINITY and NAN when missing James Myatt 2015-02-05 15:56:49 +00:00
• 0137103f4b Include config.h in linkhash so that HAVE_ENDIAN_H is defined (if available) James Myatt 2015-02-05 15:55:25 +00:00
• a74f6b2867 Updated config for vs2010/winsdk71 as well as vs2013 Define JSON_C_HAVE_INTTYPES_H in json_config.h.win32 only James Myatt 2015-02-05 15:54:19 +00:00
• 68d856f618 Merge pull request #168 from bugness-chl/master Eric Haszlakiewicz 2015-03-03 22:41:31 -05:00
• 7e3a6c6b9d Merge pull request #163 from sixlettervariables/fix-win32-build-problems Eric Haszlakiewicz 2015-03-03 22:35:36 -05:00
• da62fca305 Merge pull request #144 from mhei/master Eric Haszlakiewicz 2015-03-03 22:12:49 -05:00
• 484ca368f0 Slight style tweaks to the bsearch changest. Eric Haszlakiewicz 2015-03-04 03:10:10 +00:00
• a500c1f0b5 Merge pull request #155 from LeSpocky/bsearch Eric Haszlakiewicz 2015-03-03 22:00:08 -05:00
• 9db3099572 Merge pull request #156 from jubalh/master Eric Haszlakiewicz 2015-03-03 21:37:02 -05:00
• 99d8fc975e Tightening the number parsing algorithm chl 2015-02-05 01:34:10 +01:00
• 4d18d39d99 Adds json_config.h.win32 to project. Adds VS2k13 project. Christopher Watford 2014-12-05 10:27:44 -05:00
• 0609a5729c Fixes #160 'missing header file on windows' Christopher Watford 2014-12-05 10:22:36 -05:00
• ec4879ac5b Merge pull request #153 from LeSpocky/doc Eric Haszlakiewicz 2014-09-13 22:18:51 -04:00