Commit Graph

  • 40bd71f064 Merge pull request #257 from denis2342/master Petri Lehtinen 2015-10-14 08:54:37 +03:00
  • 067dc50efe changed code from while to do/while Denis Ahrens 2015-10-12 06:04:22 +02:00
  • 4876bda857 Merge pull request #255 from gonzzor/snprintf_dump.c Petri Lehtinen 2015-10-05 15:43:45 +03:00
  • e89538f685 Format %x expects unsigned int, not int Jonas Jonsson 2015-10-05 14:00:44 +02:00
  • f7331c7194 Use sizeof(seq) instead of magic number 13 Jonas Jonsson 2015-10-05 13:59:09 +02:00
  • 02464862ed Merge pull request #248 from phoenix0428/patch-1 Petri Lehtinen 2015-09-08 21:13:08 +03:00
  • db0213ae56 Merge pull request #252 from OlehKulykov/master Petri Lehtinen 2015-09-01 21:13:25 +03:00
  • 8f2298bad8 Buildable with MS Compiler version >= 1900 OlehKulykov 2015-08-31 23:43:29 +02:00
  • 4c4f692bd6 Add json_object_foreach_safe Petri Lehtinen 2015-08-26 17:32:55 +03:00
  • 875b78dc97 Update test_memory_funcs.c Kinam Kim 2015-08-13 16:44:31 +09:00
  • fef27e6d3e Merge branch '2.7' Petri Lehtinen 2015-05-19 08:54:13 +03:00
  • 1dab656dee doc: Copying doesn't preserve key insertion order origin/2.7 Petri Lehtinen 2015-05-19 08:48:52 +03:00
  • 69678aaa35 doc: Copying doesn't preserve key insertion order Petri Lehtinen 2015-05-19 08:48:52 +03:00
  • d384acd706 Merge pull request #234 from flok99/master Petri Lehtinen 2015-05-04 09:00:26 +03:00
  • 5d42e1520a Optimized dump_indent to reduce the number of fwrite calls. Folkert van Heusden 2015-05-01 15:18:53 +02:00
  • d8753db4ac Merge pull request #233 from haldean/master Petri Lehtinen 2015-04-30 10:43:39 +03:00
  • 95dd927857 use snprintf and strncpy in place of sprintf and strcpy Haldean 2015-04-30 00:11:25 -07:00
  • 76760011ff Don't crash when building documentation man pages Petri Lehtinen 2015-03-07 09:14:05 +02:00
  • 11813f4128 Fix a use after free Petri Lehtinen 2015-02-07 07:36:29 +02:00
  • 8b1bdcacb7 Merge pull request #221 from lioncash/test Petri Lehtinen 2015-02-05 09:28:43 +02:00
  • c242b46016 test_object: Fix a duplicate conditional check in test_iterators Lioncash 2015-02-05 01:26:13 -05:00
  • 58c188e1d5 Merge pull request #217 from JoakimSoderberg/simple_parse_cmake Petri Lehtinen 2015-01-14 08:05:51 +02:00
  • ffc18128f4 Merge pull request #216 from JoakimSoderberg/infinity_warning Petri Lehtinen 2015-01-14 08:04:37 +02:00
  • 6a38d0d431 Disable warning for deliberate use on MSVS. Joakim Soderberg 2015-01-13 16:11:03 +01:00
  • d0a8ad4c06 Compile simple_parse example for CMake project. Joakim Soderberg 2015-01-13 16:17:48 +01:00
  • c244b1483e examples/README.rst: Fix formatting Petri Lehtinen 2014-12-30 08:56:04 +02:00
  • fc83f10c85 Add Makefile.am for examples Petri Lehtinen 2014-12-30 08:46:09 +02:00
  • 8d561cd94e examples/simple_parse.c: Reindent, fix warnings & style Petri Lehtinen 2014-12-30 08:44:36 +02:00
  • 970c6988a5 Merge pull request #214 from rdpoor/master Petri Lehtinen 2014-12-30 08:33:34 +02:00
  • 220dcb7be3 use fgets() rather than getline() Robert Poor 2014-12-29 06:22:19 -08:00
  • 48e0488f07 adding simple-parse example Robert Poor 2014-12-26 10:49:15 -08:00
  • 890760b2fb Increase test coverage Petri Lehtinen 2014-12-19 08:35:31 +02:00
  • 15653c47dd Add a test case for \u0000 Petri Lehtinen 2014-12-19 07:57:33 +02:00
  • 5508ab403d Honor JSON_DECODE_INT_AS_REAL at lexical stage Petri Lehtinen 2014-12-18 15:16:14 +02:00
  • d799ee11b4 doc: Update the Getting Started chapter Petri Lehtinen 2014-12-18 14:47:07 +02:00
  • abaae7630e Make it possible to set initial hashtable size Petri Lehtinen 2014-12-18 14:43:07 +02:00
  • 5c1d87592a wip: add tests Petri Lehtinen 2014-12-15 08:30:59 +02:00
  • 5885035f5f Add coveralls.io badge to README.rst Petri Lehtinen 2014-12-15 08:14:57 +02:00
  • dee4a7c29e Merge pull request #211 from JoakimSoderberg/coveralls Petri Lehtinen 2014-12-15 08:09:13 +02:00
  • 82a55ef205 doc patch for jansson david bigagli 2014-12-12 10:58:17 -08:00
  • 19f33c0e71 Add support for coverage/coveralls.io in cmake project. Joakim Söderberg 2014-12-10 22:30:33 +01:00
  • 3c9e5c9925 Move the list member to the top of hashtable_pair struct Petri Lehtinen 2014-12-10 07:40:35 +02:00
  • 1c38ab17f5 Include jansson_config.h with quotes Petri Lehtinen 2014-12-04 10:45:26 +02:00
  • d5edfcc6fd Merge pull request #208 from skeid21/master Petri Lehtinen 2014-11-29 11:52:11 +02:00
  • 9b435df3d4 Warnings - use size_t where appropriate to prevent warning when compilation is targeting 64 bit Shawn Harris 2014-11-24 14:04:13 -07:00
  • bc743ad2d9 README: Documentation is hosted at RTD Petri Lehtinen 2014-10-20 20:27:56 +03:00
  • 19cc800ad3 Merge pull request #206 from chrullrich/fix-win-build Petri Lehtinen 2014-10-14 12:28:19 +03:00
  • b52e7a69aa Fix CFLAGS for static-CRT build. Christian Ullrich 2014-10-13 13:06:02 +02:00
  • 1395e4303a Fix static CRT selection. Christian Ullrich 2014-10-13 13:04:04 +02:00
  • d7a6269a17 Use expr instead of $((...)) in shell scripts Petri Lehtinen 2014-10-03 08:49:03 +03:00
  • 7fbe7c3960 Don't use the nonstandard __FUNCTION__ macro Petri Lehtinen 2014-10-03 08:38:57 +03:00
  • ee27b7e3dd jansson 2.7 v2.7 Petri Lehtinen 2014-10-02 09:01:51 +03:00
  • 391d9101a8 Update CHANGES for 2.7 Petri Lehtinen 2014-10-02 08:57:07 +03:00
  • 2137e0c895 Add AppVeyor badge to README.rst Petri Lehtinen 2014-09-25 07:51:55 +03:00
  • 5fc44e10aa Merge pull request #205 from JoakimSoderberg/appveyor Petri Lehtinen 2014-09-25 07:45:24 +03:00
  • b94d767f86 Added Windows CI support with appveyor Joakim Soderberg 2014-09-24 18:02:04 +02:00
  • 43f17d010a Merge pull request #204 from bgoglin/master Petri Lehtinen 2014-08-27 08:02:59 +03:00
  • fa20e80860 Parse subnormal numbers correctly Petri Lehtinen 2014-08-27 07:51:08 +03:00
  • 485c7640a1 Don't use GNU-make specific export for global AM_CFLAGS Brice Goglin 2014-08-26 14:56:14 +02:00
  • d4a7de7c11 Android.mk: Add -DHAVE_STDINT_H to LOCAL_CFLAGS Petri Lehtinen 2014-07-31 07:50:27 +03:00
  • a6229a2d3e doc: Enhance string overview Petri Lehtinen 2014-07-21 08:15:34 +03:00
  • abd151f5d7 Merge pull request #198 from Smilex/mem_fix Petri Lehtinen 2014-07-21 08:09:18 +03:00
  • 4f1238af71 Fix whitespace issues Ian T. Jacobsen 2014-07-16 00:21:16 +01:00
  • 122a1e2af9 Fixed cases where file would be opened, but not closed. And small realloc memory issue. Ian T. Jacobsen 2014-07-16 00:16:32 +01:00
  • c8d017bd88 Merge branch '2.6' Petri Lehtinen 2014-07-12 06:43:07 +03:00
  • 23b1b7ba9a Document JANSSON_BUILD_SHARED_LIBS CMake option origin/2.6 Petri Lehtinen 2014-07-12 06:39:43 +03:00
  • 88943b64e3 Define JSON_MAX_INDENT Petri Lehtinen 2014-07-07 11:29:10 +03:00
  • 348401e7b8 CMake: Use add_definitions for compiler flags Petri Lehtinen 2014-07-02 22:04:33 +03:00
  • df248712a5 Include android config in tarballs Petri Lehtinen 2014-06-28 22:40:58 +03:00
  • de1b5db70e Fix autoreconf on Debian Petri Lehtinen 2014-05-14 16:03:21 +03:00
  • 4debe8e567 Add missing tests for JSON_REAL_PRECISION Petri Lehtinen 2014-05-07 08:19:39 +03:00
  • 28d362cf28 Merge pull request #180 from Sannis/master Petri Lehtinen 2014-05-05 14:45:09 +03:00
  • 541cdf5960 Remove unneeded undef Oleg Efimov 2014-05-05 15:40:41 +04:00
  • fc6e314498 Enable usage of AddressSanitizer to check Jansson Oleg Efimov 2014-05-04 00:34:08 +04:00
  • 17b5fdd94b Add JSON_REAL_PRECISION Petri Lehtinen 2014-04-30 12:46:33 +03:00
  • 5b88cc5ded Merge branch '2.6' Petri Lehtinen 2014-04-30 12:06:03 +03:00
  • db285b3764 Check uint16_t and uint8_t support correctly Petri Lehtinen 2014-04-30 12:05:07 +03:00
  • a425f8c650 Rename variables to work aroung a GCC bug on Solaris Petri Lehtinen 2014-04-23 12:17:06 +03:00
  • 96f8916e50 Merge pull request #174 from KimJeongYeon/master Petri Lehtinen 2014-04-14 08:32:47 +03:00
  • dd2bf2971e fix build error for android KimJeongYeon 2014-04-11 23:14:34 +09:00
  • 34a64cfe53 Merge pull request #171 from firepick1/master Petri Lehtinen 2014-04-08 20:39:46 +03:00
  • 571617ebfc use __sun instead of sun Karl Lew 2014-04-08 15:57:58 +00:00
  • 3bd8a5729d Merge remote-tracking branch 'refs/remotes/origin/master' Karl Lew 2014-04-06 04:31:34 +00:00
  • 33e4988180 SmartOS build fix Karl Lew 2014-04-06 04:28:52 +00:00
  • 663fbfb7a4 SmartOS (Solaris) build firepick1 2014-04-04 17:28:08 -07:00
  • 88aa6a9e30 Remove VS2010 project files, CMake should be used on Windows instead Petri Lehtinen 2014-03-04 08:28:18 +02:00
  • 92e2588d6e Merge branch '2.6' Petri Lehtinen 2014-02-16 22:22:14 +02:00
  • 960ead07f2 Merge pull request #164 from vincentbernat/fix/gitignore Petri Lehtinen 2014-02-16 22:10:16 +02:00
  • 78da1de021 Merge pull request #163 from vincentbernat/fix/unpack-mix-optional-and-strict Petri Lehtinen 2014-02-16 22:09:41 +02:00
  • 946531bd7b Merge pull request #162 from nmlgc/master Petri Lehtinen 2014-02-16 22:09:09 +02:00
  • 10009d61a7 Merge pull request #164 from vincentbernat/fix/gitignore Petri Lehtinen 2014-02-16 22:10:16 +02:00
  • 49fc6b1194 Merge pull request #163 from vincentbernat/fix/unpack-mix-optional-and-strict Petri Lehtinen 2014-02-16 22:09:41 +02:00
  • 6e8b2e161a Merge pull request #162 from nmlgc/master Petri Lehtinen 2014-02-16 22:09:09 +02:00
  • 3922f84a2f Add new autotools-generated files to .gitignore Vincent Bernat 2014-02-15 17:47:48 +01:00
  • 56a50e147d Micro-optimization for JSON_STRICT when no optional key is used Vincent Bernat 2014-02-15 17:44:02 +01:00
  • 7a0b9af662 Allow to mix JSON_STRICT with optional keys Vincent Bernat 2014-02-15 17:23:53 +01:00
  • 4fbe44605b Three fixes for hashtable seeding on Windows nmlgc 2014-02-15 17:10:24 +01:00
  • ea7a77236c Merge branch '2.6' Petri Lehtinen 2014-02-12 08:56:17 +02:00
  • 1dc87ed5a1 Make valgrind happy v2.6 Petri Lehtinen 2014-02-12 08:54:06 +02:00
  • 50a811ca07 Fix feature checks to use correct __ATOMIC flags Petri Lehtinen 2014-02-12 08:44:29 +02:00