Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jsonc #10183

Merged
merged 13 commits into from
May 16, 2024
Merged

Jsonc #10183

merged 13 commits into from
May 16, 2024

Commits on May 14, 2024

  1. [cmake] fix typo in comment

    ondrejholy authored and akallabeth committed May 14, 2024
    Configuration menu
    Copy the full SHA
    5f07ffd View commit details
    Browse the repository at this point in the history
  2. [cmake] add JSON library find modules

    * Add module for cJSON
    * Add module for json-c
    ondrejholy authored and akallabeth committed May 14, 2024
    Configuration menu
    Copy the full SHA
    29bb435 View commit details
    Browse the repository at this point in the history
  3. [winpr,utils] add JSON parser wrapper

    as we now support cJSON and json-c we need to wrap the functions we use.
    also allows drop in replacements for older cJSON versions lacking
    certain functions.
    akallabeth committed May 14, 2024
    Configuration menu
    Copy the full SHA
    1b735a5 View commit details
    Browse the repository at this point in the history
  4. [core,client] replace cJSON with WinPR wrapper

    use the new WinPR JSON wrapper API
    akallabeth committed May 14, 2024
    Configuration menu
    Copy the full SHA
    aaded54 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    8bdf92c View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    de49d32 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2024

  1. Configuration menu
    Copy the full SHA
    4bdc9ad View commit details
    Browse the repository at this point in the history

Commits on May 16, 2024

  1. Configuration menu
    Copy the full SHA
    702acc9 View commit details
    Browse the repository at this point in the history
  2. [core,gateway] always return in case of error

    Currently, the `arm_handle_bad_request` function returns `FALSE` when the
    `cJSON_ParseWithLength` function fails to parse the message, but only when
    the `cJSON_GetErrorPtr` returns a valid pointer. It would be better to
    return regardless of the `cJSON_GetErrorPtr` return value.
    ondrejholy authored and akallabeth committed May 16, 2024
    Configuration menu
    Copy the full SHA
    9aca06e View commit details
    Browse the repository at this point in the history
  3. [cmake] really use pkg_check_modules results for json-c

    Although, the `pkg_check_modules` function is used when finding the
    json-c library, the results are never used. Let's add the `HINTS` params
    for the `find_path` and `find_library` functions.
    ondrejholy authored and akallabeth committed May 16, 2024
    Configuration menu
    Copy the full SHA
    15c78a2 View commit details
    Browse the repository at this point in the history
  4. [client,sdl] move prefs to static lib

    This is in preparation for the subsequent commit adding test case for
    the prefs functionality to avoid building the code twice.
    ondrejholy authored and akallabeth committed May 16, 2024
    Configuration menu
    Copy the full SHA
    e197d27 View commit details
    Browse the repository at this point in the history
  5. [client,sdl] use WITH_WINPR_JSON instead of WINPR_JSON_FOUND

    The WINPR_JSON_FOUND macro is never defined currently. Consequently,
    the SDL prefs always use the fallback implementation. Let's use the
    WITH_WINPR_JSON instead to really parse the sdl-freerdp.json file.
    ondrejholy authored and akallabeth committed May 16, 2024
    Configuration menu
    Copy the full SHA
    945c496 View commit details
    Browse the repository at this point in the history
  6. [winpr,utils] fix cJSON detection

    * pkg-config sets CJSON_FOUND, check for that instead of the paths, which
      might be unset or set to <var>-NOTFOUND
    * move detection to own file. find_package targets are meant to be used
      in same directory or below, but we define the WinPR target one above,
      so include it in parent
    akallabeth committed May 16, 2024
    Configuration menu
    Copy the full SHA
    4b3ecfa View commit details
    Browse the repository at this point in the history