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

• 4154c55eda Add json_object_iterator.h to installed headers. Eric Haszlakiewicz 2012-07-08 20:38:53 -05:00
• 9791c3896e Fix git commands for tagging a release. Eric Haszlakiewicz 2012-07-08 20:33:25 -05:00
• eead1a7dc4 Remove unnecessary comment from json_util.c Eric Haszlakiewicz 2012-07-08 20:32:12 -05:00
• 7bd49df30a Merge pull request #33 from mloskot/master Eric Haszlakiewicz 2012-07-08 18:27:02 -07:00
• 984303dfe5 Added a bunch of missing HAVE_* defines tested with ./configure script to fix compilation on Linux with GCC 4.7.1. The issue likely caused by my previous commits related to Visual C++ port of the code. Mateusz Loskot 2012-06-19 20:15:44 +01:00
• a789601e6d Merge pull request #27 from OBI-1/master Eric Haszlakiewicz 2012-05-30 22:04:05 -07:00
• c58386f33f Merge pull request #29 from mloskot/msvc-port Eric Haszlakiewicz 2012-05-30 21:57:28 -07:00
• 837d685d78 Use "nodoc", not "doc", for the name of the tarball w/o docs. Eric Haszlakiewicz 2012-05-30 23:03:34 -05:00
• 271c53ebdd Missing explicit casts from void* to specific pointers required. Added #define strcasecmp for Visual C++. Mateusz Loskot 2012-05-22 23:51:44 +01:00
• a6f39a3c0c Replaced #if HAVE_X with #ifdef HAVE_X as the former test is troublemaker with #define HAVE_X where #define HAVE_X 1|0 is meant. Mateusz Loskot 2012-05-21 23:22:36 +01:00
• b6ff1c2f71 array_list_expand_internal needs length, not index. (The current implementation will fail when adding index 65.) OBI-1 2012-05-09 13:52:17 +03:00
• b7cfd15705 Merge remote-tracking branch 'origin/master' into json-c-0.10 json-c-0.10-20120530 Eric Haszlakiewicz 2012-04-29 12:55:43 -05:00
• 1abaaee658 Update the ChangeLog with the rest of the changes that will be included in the 0.10 release. Eric Haszlakiewicz 2012-04-29 12:54:14 -05:00
• e7bd2e97f3 Fill in the missing pieces of the release checklist. Eric Haszlakiewicz 2012-04-29 12:54:04 -05:00
• f22de2c112 Merge branch 'master' into json-c-0.10 Eric Haszlakiewicz 2012-04-29 11:15:56 -05:00
• 0cc1db6459 Change the format used for sprintbuf (but not scanf) to use %f instead of %lf because the "l" is unnecessary and some compilers behave differently with it present (e.g. MinGW). Thanks for Mateusz Loskot for the fix. Eric Haszlakiewicz 2012-04-29 11:04:33 -05:00
• 86bf051fd2 Add the 0.10 release doxygen-generated docs to source control. Eric Haszlakiewicz 2012-04-28 15:54:56 -05:00
• c75ad201dd Add automake/autoconf generated files for the 0.10 release. Eric Haszlakiewicz 2012-04-28 15:51:43 -05:00
• 31faa49bd8 Ignore the new test1Formatted and test2Formatted executables. Eric Haszlakiewicz 2012-04-28 14:17:09 -05:00
• 4c7f38eb9b Extend test1 and test2 to run using json_object_to_json_string_ext() based on an additional command line parameter. Extend the run_output_test() function so we actually can pass command line parameters and so we can support different output files for the same test executable. Also provide some hints about what to do if a test fails (i.e. set VERBOSE=1). Eric Haszlakiewicz 2012-04-28 14:14:26 -05:00
• 3fcffe1bb0 Add a json_object_to_json_string_ext() function to allow the formatting of output to be selected. There are now three options: JSON_C_TO_STRING_SPACED, JSON_C_TO_STRING_PLAIN and JSON_C_TO_STRING_PRETTY. This also add a json_object_to_file_ext() that takes the same flags. Existing output of json_object_to_json_string() is unchanged, and uses JSON_C_TO_STRING_SPACED. Thanks fo Grant Edwards for the initial patches. Eric Haszlakiewicz 2012-04-28 13:26:09 -05:00
• a1221eba70 Add an Android-friendly build system Arun Raghavan 2012-01-20 13:00:45 +05:30
• 17caddc0ab Run configure in the autogen.sh script Arun Raghavan 2012-01-20 12:59:59 +05:30
• cb29a77c94 Add a pkgconfig file for uninstalled builds Arun Raghavan 2012-01-20 12:59:30 +05:30
• f931f61851 Fixed parsing numbers in E notation. ` Eric Haszlakiewicz 2012-04-24 22:17:13 -05:00
• 4e000a65e6 Since we already use a local json_bool type, replace any stdbool.h usage with that, since not all environments actually have a stdbool.h to use. Eric Haszlakiewicz 2012-04-24 21:54:07 -05:00
• 0f8c534502 Merge pull request #25 from kdopen/doc_cleanup Eric Haszlakiewicz 2012-04-24 11:43:29 -07:00
• ded667a612 Clean up documentation and correct sample code Keith Derrick 2012-04-23 15:34:44 -07:00
• ec7ce26ba8 Merge pull request #23 from mloskot/mloskot-msvc-fixes Eric Haszlakiewicz 2012-04-23 11:30:37 -07:00
• 8409dc039a Fix missing inttypes.h definitions for Visual Studio 2010 and earliers. Related to issue #22. Mateusz Loskot 2012-04-23 13:11:11 +01:00
• 178a4b059c Merge pull request #21 from kdopen/add_iterator Eric Haszlakiewicz 2012-04-22 21:40:07 -07:00
• 7502b377b7 Merge branch 'master' of https://github.com/json-c/json-c Eric Haszlakiewicz 2012-04-22 14:26:06 -05:00
• 3d8817978c Actually save the expected output for the test_printbuf test so it passes. Eric Haszlakiewicz 2012-04-22 14:25:08 -05:00
• 37cfe6bc4c Update the list of files to ignore. Eric Haszlakiewicz 2012-04-22 14:21:27 -05:00
• e5c1e87f05 Add a test for the printbuf functions. Eric Haszlakiewicz 2012-04-22 14:13:01 -05:00
• b80772a0f5 Use a different variable when referring to the json.la file, since the original lib_LTLIBRARIES means something special to automake. Eric Haszlakiewicz 2012-04-22 10:48:30 -05:00
• c1b8891a13 Move the rest of the tests into the tests subdirectory. Eric Haszlakiewicz 2012-04-22 10:33:41 -05:00
• 1e89ba68af Create a tests subdirectory and move one of the test to there. Eric Haszlakiewicz 2012-04-22 10:27:50 -05:00
• 020ed640e8 Merge pull request #20 from kdopen/master Eric Haszlakiewicz 2012-04-19 21:03:22 -07:00
• bcfd1f57ac Add alternative iterator implementation Keith Derrick 2012-04-12 09:54:21 -07:00
• 6917586acf Add NULL-safe get object method Keith Derrick 2012-04-12 11:44:13 -07:00
• 4a2cd966f5 Add NULL-safe lookup function Keith Derrick 2012-04-12 11:43:34 -07:00
• 74d830dc03 Add JASSERT macro to guarantee aborts Keith Derrick 2012-04-12 11:40:44 -07:00
• ca519fb817 Added explanatory notes to documentation. Keith Derrick 2012-04-05 19:33:09 -07:00
• 65f649b7ba Ignoring additional build products Keith Derrick 2012-03-30 12:34:01 -07:00
• 30dd367c0a Modify install names for library and include files Keith Derrick 2012-03-30 12:28:32 -07:00
• 21d3706192 Added explanatory notes to documentation. Keith Derrick 2012-04-05 19:33:09 -07:00
• e0fa94ba31 Fix some bugs with how buffer sizes were being calcuated in printbuf_memset and an off-by-one error in printbuf_memappend. Eric Haszlakiewicz 2012-04-03 14:54:25 -05:00
• 7f3298da85 Remove the "#undef PRINTBUF_DEBUG" from printbuf.h so it can be more easily turned on in the Makefile. Eric Haszlakiewicz 2012-04-03 14:48:15 -05:00
• 8310d3634c Add a printbuf_memset() function to provide an effecient way to set and append things like whitespace indentation. Eric Haszlakiewicz 2012-04-02 15:39:55 -05:00
• 0d79b53456 Fix some bugs with how buffer sizes were being calcuated in printbuf_memset and an off-by-one error in printbuf_memappend. Eric Haszlakiewicz 2012-04-03 14:54:25 -05:00
• 61a154e58b Remove the "#undef PRINTBUF_DEBUG" from printbuf.h so it can be more easily turned on in the Makefile. Eric Haszlakiewicz 2012-04-03 14:48:15 -05:00
• 2d48543f2e Add a printbuf_memset() function to provide an effecient way to set and append things like whitespace indentation. Eric Haszlakiewicz 2012-04-02 15:39:55 -05:00
• 2b5929bb13 Direct people to send bug reports to the json-c google group. Eric Haszlakiewicz 2012-03-31 23:17:31 -05:00
• a7bd85caba Remove a few more things in the distclean target to get rid of *all* generated files. Eric Haszlakiewicz 2012-03-31 23:17:00 -05:00
• f30a9ace77 Fix a bug in json_tokener_parse_ex when re-using the same tokener to parse multiple objects. Now, json_tokener_reset() does not need to be called after a valid object is parsed. Eric Haszlakiewicz 2012-03-31 22:53:43 -05:00
• 30c6c4a1be Split the json_tokener_parse tests off from test1 into their own test and add several more cases to check various incremental parsing situations. Eric Haszlakiewicz 2012-03-31 22:51:39 -05:00
• bb7978c95f For the prototype for json_tokener_error_desc(). Eric Haszlakiewicz 2012-03-31 22:49:58 -05:00
• 23d0da5870 Mention json_type_to_name() in the docs for json_object_get_type(). Eric Haszlakiewicz 2012-03-31 22:47:47 -05:00
• 7c4a964002 Define a LH_LOAD_FACTOR constant and note the range that it can be set to. Change the resize check from "count > size" to "count >= size" to avoid a potential infinite loop with high load factors and a full hash table. Eric Haszlakiewicz 2012-03-31 17:33:58 -05:00
• e6668b1406 Adjust json_object_is_type and json_object_get_type so they return json_type_null for NULL objects. Eric Haszlakiewicz 2012-03-31 13:47:28 -05:00
• d7db7e81a5 Ignore several more files, include .o's, .lo's, etc... Eric Haszlakiewicz 2012-03-31 12:55:52 -05:00
• 9885b30c0e Perform better error checking in json_tokener_parse_verbose and rewrite json_tokener_parse to use that instead of json_tokener_parse_ex. Fix a typo in the string represenations of the json_tokener_error_depth error (s/to deep/too deep/) Eric Haszlakiewicz 2012-03-31 12:52:59 -05:00
• 781798ccdf Direct people to send bug reports to the json-c google group. Eric Haszlakiewicz 2012-03-31 23:17:31 -05:00
• fbd207bd6b Remove a few more things in the distclean target to get rid of *all* generated files. Eric Haszlakiewicz 2012-03-31 23:17:00 -05:00
• d809fa60c5 Fix a bug in json_tokener_parse_ex when re-using the same tokener to parse multiple objects. Now, json_tokener_reset() does not need to be called after a valid object is parsed. Eric Haszlakiewicz 2012-03-31 22:53:43 -05:00
• c5c623a546 Split the json_tokener_parse tests off from test1 into their own test and add several more cases to check various incremental parsing situations. Eric Haszlakiewicz 2012-03-31 22:51:39 -05:00
• 1489b081a7 For the prototype for json_tokener_error_desc(). Eric Haszlakiewicz 2012-03-31 22:49:58 -05:00
• 6ff0817bac Mention json_type_to_name() in the docs for json_object_get_type(). Eric Haszlakiewicz 2012-03-31 22:47:47 -05:00
• 64c0ca3690 Define a LH_LOAD_FACTOR constant and note the range that it can be set to. Change the resize check from "count > size" to "count >= size" to avoid a potential infinite loop with high load factors and a full hash table. Eric Haszlakiewicz 2012-03-31 17:33:58 -05:00
• aef439a175 Adjust json_object_is_type and json_object_get_type so they return json_type_null for NULL objects. Eric Haszlakiewicz 2012-03-31 13:47:28 -05:00
• 7e57d63aeb Merge pull request #16 from kdopen/master Eric Haszlakiewicz 2012-03-31 11:12:20 -07:00
• d3c37b82a6 Ignore several more files, include .o's, .lo's, etc... Eric Haszlakiewicz 2012-03-31 12:55:52 -05:00
• 3620cba6d0 Perform better error checking in json_tokener_parse_verbose and rewrite json_tokener_parse to use that instead of json_tokener_parse_ex. Fix a typo in the string represenations of the json_tokener_error_depth error (s/to deep/too deep/) Eric Haszlakiewicz 2012-03-31 12:52:59 -05:00
• 37e7467476 Rename boolean type to json_bool Keith Derrick 2012-03-26 14:29:31 -07:00
• 2f9091f559 Add json_tokener_get_error() and json_tokener_error_desc() to better encapsulate the process of retrieving errors while parsing. Add documentation for the json_tokener_parse_ex() function. Eric Haszlakiewicz 2012-02-22 08:24:40 -06:00
• b21b137805 Include json_inttypes.h in json_object.h since we use types like int32_t in the API and some systems need that header to compile. As part of this create a public json_config.h with a custom define to decide whether to include inttypes.h to avoid conflicting with other projects config.h header. Eric Haszlakiewicz 2012-02-15 20:44:54 -06:00
• 15db9372f3 Merge branch 'master' of https://github.com/json-c/json-c Eric Haszlakiewicz 2012-02-15 19:38:07 -06:00
• 44f0f62252 Issue#10: add some const qualifiers so test1 compiles again. Eric Haszlakiewicz 2012-02-15 19:37:04 -06:00
• 0bc84fcaaf Merge pull request #12 from jameinel/win32-project Eric Haszlakiewicz 2012-02-15 17:11:47 -08:00
• 6a231e4b41 Some updates to make the code compatible with VC 9 (2008) John Arbash Meinel 2012-02-01 09:27:49 +01:00
• faa535386a Merge pull request #11 from deweerdt/master Eric Haszlakiewicz 2012-01-29 15:49:48 -08:00
• db050901fa json_tokener_parse(): avoid possible NULL deref Frederik Deweerdt 2012-01-18 17:01:19 -08:00
• 393085a4ba Merge pull request #7 from federicoculloca/master Eric Haszlakiewicz 2011-12-09 14:42:41 -08:00
• fc3d2114a6 Merge pull request #8 from mstorsjo/mingw Eric Haszlakiewicz 2011-12-09 14:41:40 -08:00
• a577ba376f Add -no-undefined to the libtool flags Martin Storsjo 2011-11-25 23:43:25 +02:00
• 7ec34c9b39 Added capitalized charaters to json_hex_chars Federico Culloca 2011-10-30 12:13:15 +01:00
• fbae8ad0ad Merge pull request #4 from deweerdt/master Eric Haszlakiewicz 2011-10-12 17:42:36 -07:00
• c43871c866 Add new json_object_array_sort function Frederik Deweerdt 2011-10-07 21:07:18 +02:00
• a8ffbe97b0 Add an initial (incomplete) release checklist. Eric Haszlakiewicz 2011-06-14 10:01:27 -05:00
• 06e52abedb Add Jehiah and myself to the list of authors. Eric Haszlakiewicz 2011-06-14 09:56:00 -05:00
• e6c76dab66 Update README files with pointers to new github repo and googlegroups mailing list Michael Clark 2011-06-14 10:04:24 +08:00
• 276123efe0 handle NULL passed to json_objct_object_get Jehiah Czebotar 2011-05-26 01:34:52 +00:00
• 43d2f417c7 move definition of json_object_iter to public header to enable external use of json_object_object_foreachC Jehiah Czebotar 2011-05-25 04:49:20 +00:00
• 1910225b7c Set the svn:executable property so running the test_null test works properly. Eric Haszlakiewicz 2011-05-03 21:28:11 +00:00
• a37ddcff2d Note the json-c home page in the README file. Eric Haszlakiewicz 2011-05-03 21:19:55 +00:00
• 20707f4e14 Note a few recent changes in the ChangeLog. Eric Haszlakiewicz 2011-05-03 21:17:50 +00:00
• 7a593a0fa7 Bump up the libtool library version to "1:0:1" (aka libjson.0.1.0) since the API has been extended, but is still backwards compatible.. Eric Haszlakiewicz 2011-05-03 21:12:17 +00:00
• 0354e19c31 Bump the version to 0.10, since that's what we were at. Eric Haszlakiewicz 2011-05-03 21:09:30 +00:00
• 41e67d0f6f Add a test_cast test case. This checks that the casting that is implied when calling the various json_object_get_FOO() functions on a differently typed object works correctly. Eric Haszlakiewicz 2011-05-03 20:42:25 +00:00