summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Put the most recent image first in appveyor builds.newer-appveyorEric Haszlakiewicz2021-11-291-2/+5
|
* Skip most "Release" builds. s/b_config/CONFIGURATION/ to fix artifact creation.Eric Haszlakiewicz2021-11-291-3/+17
|
* There doesn't seem to be a way to extend the appveyor build matrix for just ↵Eric Haszlakiewicz2021-11-271-20/+77
| | | | one image, so instead list a whole bunch of excluded builds.
* Use the newer appveyor images to build for VS2017 and VS2019. Trim the ↵Eric Haszlakiewicz2021-11-271-16/+30
| | | | number of builds we do.
* Note the need to also set CTEST_OUTPUT_ON_FAILURE to get test outputEric Haszlakiewicz2021-11-261-1/+1
|
* Merge pull request #732 from DiracResearch/fix/static_include_dirsEric Hawicz2021-11-114-9/+14
|\ | | | | Fix/static include dirs
| * Fix uninitialized value error for clang-8 msanRobert Bielik2021-11-111-3/+3
| |
| * Fix for clang ub sanitizerRobert Bielik2021-11-112-6/+6
| |
| * Add target include dirs for static library as wellRobert Bielik2021-11-111-0/+5
|/
* Merge pull request #727 from jobol/propo2Eric Hawicz2021-10-225-8/+19
|\ | | | | Really use prefix JSON_C_OBJECT_ADD_
| * Really use prefix JSON_C_OBJECT_ADD_*José Bollo2021-10-195-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This change introduces JSON_C_OBJECT_ADD_CONSTANT_KEY as a replacement of JSON_C_OBJECT_KEY_IS_CONSTANT. The description of json_object_object_add_ex tells to look at the flags JSON_C_OBJECT_ADD_* but it is not for JSON_C_OBJECT_KEY_IS_CONSTANT. From the point of vue of a developper using json-c, the function json_object_object_add_ex is mainly used, not the hash facility, it seems more natural to provide a regular naming of prefix JSON_C_OBJECT_ADD_CONSTANT_KEY.
* | Merge pull request #729 from DeX77/patch-1Eric Hawicz2021-10-171-1/+2
|\ \ | |/ |/| * don't assume includedir
| * * don't assume includedirDeX772021-10-151-1/+2
|/ | | This change syncs the public header include install location with what gets written into pkgconfig file.
* Merge pull request #726 from leongross/fix/test-cmake3.1Eric Hawicz2021-10-092-2/+2
|\ | | | | fix cmake version for tests
| * fix cmake version for testsLeon Gross2021-10-062-2/+2
|/
* Merge pull request #722 from imaami/fix-json_tokener_new_ex-use-after-freeEric Hawicz2021-09-041-1/+1
|\ | | | | Fix use-after-free in json_tokener_new_ex()
| * Fix use-after-free in json_tokener_new_ex()Juuso Alasuutari2021-09-041-1/+1
|/ | | | | | | | | The failure path taken in the event of printbuf_new() returning NULL calls free() on tok->stack after already having freed tok. Swap the order of the two calls to fix an obvious memory access violation. Fixes: bcb6d7d3474b ("Handle allocation failure in json_tokener_new_ex") Signed-off-by: Juuso Alasuutari <juuso.alasuutari@gmail.com>
* Merge pull request #718 from Pawday/masterEric Hawicz2021-07-311-6/+9
|\ | | | | CMake create uninstall target if unix generator is used
| * Setted cmake "uninstall" target to exist in unix like operating systems onlyPawday2021-07-261-6/+9
|/
* Add workaround for Visual Studio not knowing about "inline".Eric Haszlakiewicz2021-07-251-0/+7
|
* Switch the Travis build to use osx_image: xcode12.5, in an attempt to avoid ↵Eric Haszlakiewicz2021-07-251-1/+1
| | | | timeouts with Homebrew.
* Merge some old work to include (some of) PR #464 into the current master branch.Eric Haszlakiewicz2021-07-2527-110/+274
|\
| * Only define an "uninstall" target if it's not already defined (e.g. by ↵Eric Haszlakiewicz2021-07-251-4/+6
| | | | | | | | projects that include json-c)
| * Merge pull request #714 from Hex052/clang-format_AfterCaseLabelEric Hawicz2021-07-051-0/+2
| |\ | | | | | | Add AfterCaseLabel to .clang-format
| | * Add AfterCaseLabel to .clang-formatHex0522021-07-041-0/+2
| |/ | | | | | | This is to fix the behavior that might've changed between older versions of clang-format, I'm not sure. Version 10 tries to put the bracket on the same line as case without this.
| * If inttypes.h is present, use it, even on Windows.Eric Haszlakiewicz2021-06-131-1/+4
| |
| * Issue #709: adjust some include guards to be a bit more json-c specific.Eric Haszlakiewicz2021-06-024-8/+8
| |
| * Merge pull request #706 from davidjmccann/masterEric Hawicz2021-05-151-2/+2
| |\ | | | | | | Check __STDC_VERSION__ is defined before checking its value
| | * Merge branch 'json-c:master' into masterDavid McCann2021-05-1350-1360/+2427
| | |\ | | |/ | |/|
| * | Merge pull request #696 from ssrlive/masterEric Hawicz2021-05-015-4/+8
| |\ \ | | | | | | | | To avoid target exe file export JSON functions.
| | * | To avoid target exe file export JSON functions.ssrlive2021-03-025-4/+8
| | | |
| * | | Merge pull request #701 from commodo/configurable-optsEric Hawicz2021-04-174-28/+43
| |\ \ \ | | | | | | | | | | [RFC] json_pointer: allow the feature to be disabled
| | * | | json_pointer: allow the feature to be disabledAlexandru Ardelean2021-04-164-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some users may not want to included it in their build/system. So allow a cmake symbol to disable it. A user can do 'cmake -DDISABLE_JSON_POINTER=ON <json_c_root_dir>' and disable the json_pointer functionality. That saves about 17 KB (on an x86_64) machine. This may be useful on smaller embedded systems; even though the saving would be fewer kilobytes. One thing that also needs to change a bit, is that the 'json.h' be autogenerated via cmake, in order to conditionally include that "json_pointer.h" file. Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
| | * | | tests: CMakeLists.txt: move test names to variableAlexandru Ardelean2021-04-161-24/+26
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The intent is to be able to disable some features that get built into the library. When we do that, we also need to disable some tests. It's easier when adjusting a variable that contains the list of test names, versus modifying the list in the foreach() statement. Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
| * | | Merge pull request #700 from Philosoph228/werror-fixEric Hawicz2021-04-141-1/+0
| |\ \ \ | | |/ / | |/| | Fix unused variable for Win32 build in random_seed.c
| | * | random_seed: fix unused variable for win32 buildPhilosoph2282021-04-131-1/+0
| |/ /
| * | Add a DISABLE_EXTRA_LIBS option to skip using libbsd, per @neheb's request ↵Eric Haszlakiewicz2021-02-152-1/+6
| | | | | | | | | | | | on issue #692/commit 0f61f692.
| * | If arc4random is used, don't bother compiling in the other fallback methods ↵Eric Haszlakiewicz2021-02-131-11/+30
| | | | | | | | | | | | since they'll never be used. Fixes PR#695 about unreachable code too.
| * | Merge pull request #694 from ihsinme/patch-1Eric Hawicz2021-02-061-3/+3
| |\ \ | | | | | | | | fix invalid unsigned arithmetic.
| | * | Update json_object.cihsinme2021-02-051-3/+3
| |/ /
| * | Iesue #692: use arc4random() if it's available (in libc on BSD systems, and ↵Eric Haszlakiewicz2021-01-133-2/+28
| | | | | | | | | | | | libbsd on Linux).
| * | Keep the doc directory in the nodoc release tarball, just exclude its contents.Eric Haszlakiewicz2021-01-131-1/+1
| | |
| * | Merge pull request #674 from ploxiln/random_seed_err_continueEric Hawicz2021-01-121-40/+29
| |\ \ | | | | | | | | random_seed: on error, continue to next method
| | * | random_seed: on error, continue to next methodPierce Lopez2020-10-071-40/+29
| | | | | | | | | | | | | | | | instead of exiting the process
| * | | Merge pull request #689 from neheb/patch-1Eric Hawicz2020-12-181-1/+1
| |\ \ \ | | |/ / | |/| | fix compilation with clang
| | * | fix compilation with clangRosen Penev2020-12-171-1/+1
| |/ / | | | | | | | | | | | | | | | | | | Fixes the following warning: json_pointer.c:230:7: warning: implicit declaration of function 'vasprintf' is invalid in C99 [-Wimplicit-function-declaration] rc = vasprintf(&path_copy, path_fmt, args);
| * | Merge pull request #667 from stoeckmann/regressionEric Hawicz2020-09-111-0/+2
| |\ \ | | | | | | | | Fixed test1 regression.
| | * | Fixed test1 regression.Tobias Stoeckmann2020-09-111-0/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | SIZEOF_SIZE_T might be only defined in config.h. Include config.h for these systems to pass tests which are only supposed to be run on 32 bit systems. Fixes issue #666.
| * | Merge pull request #665 from stoeckmann/tokenerEric Hawicz2020-08-241-0/+6
| |\ \ | | | | | | | | Handle more allocation failures in json_tokener* functions
| | * | Handle allocation failure in json_tokener_new_exTobias Stoeckmann2020-08-221-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | The allocation of printbuf_new might fail. Return NULL to indicate tis error to the caller. Otherwise later usage of the returned tokener would lead to null pointer dereference.
View Lorry Controller Status