json-c

mirror/json-c

Fork 0

mirror of https://github.com/json-c/json-c.git synced 2026-03-18 20:49: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

78b089bc1e Fixed test_parse for \f Iskren Chernev 2013-01-28 19:06:49 -08:00
cca74c6de6 add json_object_object_length Greg Hazel 2013-01-11 01:36:55 -08:00
3ae296f694 Merge pull request #60 from ghazel/master Eric Haszlakiewicz 2013-01-09 15:26:42 -08:00
2be921d883 Fixed json_object_object_add(). Alexander Klauer 2013-01-08 14:24:21 +01:00
77d0493b70 rename _errno Greg Hazel 2013-01-03 16:54:04 -08:00
85da28c534 Merge pull request #58 from Abioy/master Eric Haszlakiewicz 2013-01-02 10:08:44 -08:00
7eaa849e9a escape '\f' in json_escape_str Abioy 2012-12-24 22:22:05 +08:00
fcc768e667 Bump the version up to 0.10.99 to make it clear that the master branch is beyond anything on the 0.10 branch. Eric Haszlakiewicz 2012-12-23 11:09:20 -06:00
2943691181 Merge branch 'master' of https://github.com/json-c/json-c Eric Haszlakiewicz 2012-12-23 10:59:52 -06:00
1461b49385 Add a json_c_version.h header (included from json.h), and several macros and functions for retrieving the json-c version at compile-time and run-time. Eric Haszlakiewicz 2012-12-23 10:57:44 -06:00
56166e2dff Merge pull request #51 from remicollet/issue-dyndepth Eric Haszlakiewicz 2012-12-23 08:39:46 -08:00
d7de3aa24b Update the release checklist to include the INSTALL file, and adjust the git command to add the doc directory. Eric Haszlakiewicz 2012-12-23 10:27:14 -06:00
2e9fef38c2 Revert the test_null test back to emitted to stdout, and update the expected output to match. Eric Haszlakiewicz 2012-12-23 10:25:03 -06:00
86aedc2d2a Merge pull request #56 from TheCount/develop Eric Haszlakiewicz 2012-12-23 08:23:13 -08:00
18abf6e509 More warnings, fewer errors, C99 Alexander Klauer 2012-12-19 13:55:02 +01:00
024d86c07f Prepend DESTDIR to paths for staged installs Alexander Klauer 2012-12-19 13:16:38 +01:00
57f36ed32a Write additional test info to stderr instead of stdout so as not to mar the expected output Alexander Klauer 2012-12-19 10:52:50 +01:00
827a4a97b9 Fixed memory leak in testReplaceExisting Alexander Klauer 2012-12-19 10:46:35 +01:00
beb12d49e1 Make macro json_object_object_foreach multiple-use safe Alexander Klauer 2012-12-19 10:31:39 +01:00
20ef1bd980 Remove and ignore autogenerated installation instructions Alexander Klauer 2012-12-19 09:40:10 +01:00
8f58f09c69 Ignore editor swap files Alexander Klauer 2012-12-19 09:38:45 +01:00
54d551c810 Ignore doc dir for now Alexander Klauer 2012-12-18 18:53:04 +01:00
b1d61d10e1 Library is now called libjson-c Alexander Klauer 2012-12-18 18:46:24 +01:00
a3a0f5b28d Need to explicitly remove include/json-c directory Alexander Klauer 2012-12-18 18:45:39 +01:00
b670f6f992 -d test is useless as symlinks are dereferenced Alexander Klauer 2012-12-18 18:44:52 +01:00
e176965c1c Ignore valgrind output files Alexander Klauer 2012-12-18 18:27:39 +01:00
32d149c8f6 probably worth an option for this Remi Collet 2012-12-13 11:46:04 +01:00
8c847968c7 Save space, drop unuseful trailing zeroes Remi Collet 2012-12-13 11:22:31 +01:00
4014fe86d9 Simple fix to double encode Remi Collet 2012-12-13 11:16:03 +01:00
a01b659ace move locale change to be global for perf Remi Collet 2012-12-13 09:47:33 +01:00
4e4af93d66 Fix issue #53 - ensure explicit length string are still NUL terminated, and fix json_tokener_parse() to work properly with embedded unicode \u0000 values in strings. Adjust test_null to check for this case. See also http://bugs.debian.org/687269 Eric Haszlakiewicz 2012-12-09 16:32:11 -06:00
5c2a69a8b8 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. json-c-0.10 Mateusz Loskot 2012-06-19 20:15:44 +01:00
4392b22e80 Regenerate Makefile.in Eric Haszlakiewicz 2012-12-09 15:51:02 -06:00
e1663d4dfa Remove configure as part of maintainer-clean instead of distclean. Addresses issue #48. Eric Haszlakiewicz 2012-12-09 15:46:35 -06:00
7a4506d6df Remove configure as part of maintainer-clean instead of distclean. Addresses issue #48. Eric Haszlakiewicz 2012-12-09 15:46:35 -06:00
7653d4952a Add PACKAGE_URL to config.h.in Eric Haszlakiewicz 2012-12-09 15:46:23 -06:00
aec876357c Add a missing json_object_get() so we don't try to use a freed object in test1. Eric Haszlakiewicz 2012-11-29 15:06:17 -05:00
447b88a115 Fix a memory leak in the test_printbuf test. Eric Haszlakiewicz 2012-11-29 13:29:55 -06:00
23461c75dd Include json_object_iterator.c in the list of sources. Eric Haszlakiewicz 2012-11-29 13:23:06 -06:00
16a4a32e29 float parsing must be locale independent Remi Collet 2012-11-27 11:06:49 +01:00
197cb1d1c1 Make maximum recursion depth a runtime option Remi Collet 2012-11-27 09:01:45 +01:00
f6b27cbb6c Make it safe to delete keys while iterating with the json_object_object_foreach macro. Eric Haszlakiewicz 2012-10-20 20:26:37 -05:00
5abc0ea444 Reformat the json_object_object_foreach macro so it is readable, and document what is allowed to be done with the object while iterating. Eric Haszlakiewicz 2012-10-20 20:10:15 -05:00
e36e562872 Reformat json_object_object_get() and json_object_object_get_ex(). Eric Haszlakiewicz 2012-10-18 17:16:36 -05:00
5450bed051 Fix json_object_object_get() so it returns NULL if the incoming json_object is NULL. Eric Haszlakiewicz 2012-10-18 17:14:41 -05:00
5f4739e2eb Change json_object_put to return 1 if the object passed was actually freed. (or 0 if only the reference count was decremented) Eric Haszlakiewicz 2012-10-18 17:10:09 -05:00
c3d1d597ab Fix a memory leak in test1 with respect to how json_object_object_del was used. Eric Haszlakiewicz 2012-09-16 20:49:22 -05:00
c3068bfd09 Reformat the test sources. No functional change. Eric Haszlakiewicz 2012-09-16 20:43:29 -05:00
d1f237e28a Fix the home page in the README, and add a list of prerequisites. Eric Haszlakiewicz 2012-09-10 17:32:14 -05:00
059e8f4d1d Merge pull request #44 from lastquestion/fix_gnu_macosx Eric Haszlakiewicz 2012-09-09 19:24:47 -07:00
e7e0600405 Add an autoconf test to test whether the .section .gnu<warning> works with the linker on the system, and define _warn_references to nothing if not. Lin Xu 2012-09-09 17:33:35 -07:00
d5d41bc017 Copy over the win32 readme file too. Eric Haszlakiewicz 2012-09-09 15:05:09 -05:00
2003e427ac Add a copy of the json-c-0.10 docs in a form that should be browsable on github. Eric Haszlakiewicz 2012-09-09 14:58:17 -05:00
4b1a0668a8 Update the set_serializer test to match the actual output. Eric Haszlakiewicz 2012-09-09 13:53:12 -05:00
38f421a2e7 Add a json_set_serializer() function to allow the string output of a json_object to be customized. Eric Haszlakiewicz 2012-09-02 15:21:56 -05:00
d305cae12c Ignore the tests/testReplaceExisting binary. Eric Haszlakiewicz 2012-07-29 20:00:28 -05:00
8ce53f9d1e Note the rename in the ChangeLog, and update the instructions in the README file. Eric Haszlakiewicz 2012-07-29 18:43:55 -05:00
2f2180b70d Take a guess as to the rename changes changes needed to the Android part of the build. I think this should work, but I can't test it. Eric Haszlakiewicz 2012-07-29 18:29:38 -05:00
1f9d199522 Re-add the "json" pkg-config file as a compatibility shim. Also rename the json-c-uninstalled.pc file. Eric Haszlakiewicz 2012-07-29 18:25:09 -05:00
9f16e25a3e Bump the version of the new library since programs will need to be re-linked to use it. Eric Haszlakiewicz 2012-07-29 18:05:34 -05:00
943b7a4de7 Add a compatibility symlink json->json-c in the include directory. Eric Haszlakiewicz 2012-07-29 18:05:08 -05:00
075b783631 Add a --disable-oldname-compat option to configure to turn off the creation of the libjson.so library, and only include libjson-c.so Eric Haszlakiewicz 2012-07-29 17:48:22 -05:00
c7a21203de Ignore a couple more generated files. Eric Haszlakiewicz 2012-07-29 15:10:30 -05:00
082419edf9 Fix the Libs line in json-uninstalled.pc to use -ljson-c Eric Haszlakiewicz 2012-07-29 15:09:59 -05:00
b98aa6eaa3 Create an additional libjson.so library that simply links against libjson-c, but emits a warning encouraging the use of the new library. Eric Haszlakiewicz 2012-07-29 14:59:01 -05:00
eb37094aa6 Check for the sys/cdefs.h header which on some systems defines the __warn_references macro. Eric Haszlakiewicz 2012-07-29 14:57:59 -05:00
ba1c3810cb Remove test_parse from the top level directory. (accidentally re-introduced with the last merge) Eric Haszlakiewicz 2012-07-29 14:08:26 -05:00
c2d3ccf3af Merge branch 'rename_library' of https://github.com/kdopen/json-c into kdopen-rename_library Eric Haszlakiewicz 2012-07-29 14:06:52 -05:00
92f31bd99a Handle the \f escape sequence (the two characters: backslash followed by an f, not a literal formfeed) and extend the test_parse test to check all valid escape sequences. Eric Haszlakiewicz 2012-07-29 12:31:07 -05:00
8fcfeb63ec Default autogen.sh to not running configure, unless some command line options are specified. Eric Haszlakiewicz 2012-07-29 12:18:37 -05:00
77c6239465 Initialize errno before calling sscanf in json_parse_int64() so parsing valid numbers after parsing an out of range number works. Eric Haszlakiewicz 2012-07-29 12:13:54 -05:00
2da148df56 Merge pull request #37 from cgwalters/master Eric Haszlakiewicz 2012-07-29 09:46:22 -07:00
6988f53fcb Rewrite json_object_object_add to replace just the value if the key already exists so keys remain valid. This is particularly useful when replacing values in a loop, since it allows the key used by json_object_object_foreach to continue to be used. Eric Haszlakiewicz 2012-07-24 23:27:41 -05:00
6d9437725a autogen.sh: Add /bin/sh interpreter, honor NOCONFIGURE=1 Colin Walters 2012-07-11 15:33:49 -04:00
381f77c5bc Merge pull request #26 from ford-prefect/master Eric Haszlakiewicz 2012-07-08 19:01:19 -07:00
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