Permalink
Commits on Sep 12, 2016
  1. Merge pull request #267 from sixlettervariables/patch-1

    Removes me as Win32 maintainer, because I'm not.
    hawicz committed on GitHub Sep 12, 2016
  2. Removes me as a maintainer, because I'm not.

    Updates README-WIN32.html to remove my status as a maintainer (I'm not). Also removes ancient porting notes and adds a reference to json_config.h.win32 which is where most folks should go to start with Windows issues.
    sixlettervariables committed on GitHub Sep 12, 2016
Commits on Aug 25, 2016
  1. Issue #263: add const so the prototype for json_object_object_add_ex(…

    …) matches the definition.
    hawicz committed Aug 25, 2016
  2. Add Cmakefile

    Randy Armstrong committed with hawicz Aug 24, 2016
Commits on Aug 21, 2016
  1. Fix memory leak and inconsistent output (due to varying fd numbers) i…

    …n test_util_file.
    hawicz committed Aug 21, 2016
  2. Issue #260: add a check to prevent trivial loops in the object tree, …

    …even though it is up to the callers to avoid doing so in more complex cases.
    hawicz committed Aug 21, 2016
  3. json_object_object_add_ex() should have shared code with json_object_…

    …object_add(), and been changed to return int at the same time the latter was. Do that now.
    
    Also correct a couple of calls to _to_json_string to check the return value.
    hawicz committed Aug 21, 2016
Commits on Aug 13, 2016
  1. Merge branch 'RyDroid-tests'

    hawicz committed Aug 13, 2016
  2. Merge branch 'tests' of https://github.com/RyDroid/json-c into RyDroi…

    …d-tests
    
    Conflicts:
    	tests/test_util_file.c
    hawicz committed Aug 13, 2016
  3. Merge pull request #251 from RyDroid/editorconfig

    Adding a file for EditorConfig
    hawicz committed on GitHub Aug 13, 2016
Commits on Aug 12, 2016
  1. Adding a file for EditorConfig

    RyDroid committed Aug 7, 2016
Commits on Aug 11, 2016
  1. Revert bogus change to json_object_get() made in f40b08d that caused …

    …it to always return NULL. (Issue #259)
    
    Also undo NULL check in json_tokener_set_flags(): it's not at all valid toi
     try to set flags on a NULL pointer, and doing so should not be silently
     ignored.
    hawicz committed Aug 11, 2016
Commits on Aug 10, 2016
  1. Merge pull request #255 from RyDroid/minor-c2

    Minor changes in C source code
    hawicz committed on GitHub Aug 10, 2016
Commits on Aug 9, 2016
  1. Merge pull request #252 from RyDroid/minor-no-c

    Very minor changes not related to C source code
    hawicz committed on GitHub Aug 9, 2016
  2. Merge branch 'jobol-issue-165'

    hawicz committed Aug 9, 2016
  3. Merge branch 'issue-165' of https://github.com/jobol/json-c into jobo…

    …l-issue-165
    
    Conflicts:
    	tests/test_util_file.c
    hawicz committed Aug 9, 2016
  4. Merge pull request #253 from RyDroid/cppcheck-travis

    Adding a test with cppcheck for Travis CI
    hawicz committed on GitHub Aug 9, 2016
  5. Merge pull request #249 from RyDroid/readme

    Improving README
    hawicz committed on GitHub Aug 9, 2016
Commits on Aug 8, 2016
  1. Merge pull request #250 from RyDroid/gitignore

    Improving .gitignore
    hawicz committed on GitHub Aug 8, 2016
  2. Improving .gitignore

    RyDroid committed Aug 7, 2016
  3. Improving README

    RyDroid committed Aug 7, 2016
  4. Minor changes in C source code

    RyDroid committed Aug 8, 2016
Commits on Aug 3, 2016
  1. Issue #246: Include xlocale.h too, to get locale_t defined, since not…

    … all OSes include that in locale.h
    hawicz committed Aug 3, 2016
Commits on Aug 1, 2016
  1. test: add test of 'json_object_to_json_string_length'

    The test is implied in test1.
    
    The idea is to check that the returned lengths and strings
    are identical to what is expected to return the already
    tested function 'json_object_to_json_string_ext'.
    
    Signed-off-by: José Bollo <jose.bollo@iot.bzh>
    jobol committed Aug 1, 2016
Commits on Jul 31, 2016
  1. Issue #195: Actually call uselocale() in the new locale handling code…

    … in json_tokener.
    
    Also, be sure the right locale_t is freed if we fail on the second uselocale.
    Finally, fix test_locale so it *doesn't* use json_object_to_json_string as
     that will simple re-emit the original parsed string values.
    hawicz committed Jul 31, 2016
  2. Issue #195: use uselocale() instead of setlocale() in json_tokener to…

    … behave better in threaded environments.
    hawicz committed Jul 31, 2016
Commits on Jul 30, 2016
  1. Linux's %p format doesn't return "0x0" for NULL pointers, so switch t…

    …o using %lx for consistency.
    hawicz committed Jul 30, 2016
  2. Issue #240: add arbitrary use of val's in foreach loops to squash war…

    …nings about unused variables.
    hawicz committed Jul 30, 2016
Commits on Jul 27, 2016
  1. Add method 'json_object_to_json_string_length'

    This new method allows to also
    get the length of the generated string.
    
    Fix #165
    
    Change-Id: Iea91404027f143ca3d29a4c58d7c07ae53556110
    Signed-off-by: José Bollo <jose.bollo@iot.bzh>
    jobol committed with jobol Jul 26, 2016
  2. Fix a compiling error

    The function fstat isn't declared without this include
    on debian strect/sid and Fedora-23
    
    Change-Id: I660a32ff173dcba04674aed51ed855b4fa55ac67
    Signed-off-by: José Bollo <jose.bollo@iot.bzh>
    jobol committed Jul 27, 2016
Commits on Jul 16, 2016
  1. Merge pull request #239 from ploxiln/printbuf_empty

    initialize null terminator of new printbuf
    hawicz committed on GitHub Jul 16, 2016