mirror of
https://github.com/wiiu-env/libcurlwrapper.git
synced 2024-06-02 15:38:52 +02:00
Compare commits
3 Commits
38209a1671
...
915bd97ad3
Author | SHA1 | Date | |
---|---|---|---|
|
915bd97ad3 | ||
|
7cdd247c65 | ||
|
f6a089cab2 |
4
.github/workflows/pr.yml
vendored
4
.github/workflows/pr.yml
vendored
|
@ -6,7 +6,7 @@ jobs:
|
||||||
clang-format:
|
clang-format:
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
- name: clang-format
|
- name: clang-format
|
||||||
run: |
|
run: |
|
||||||
docker run --rm -v ${PWD}:/src ghcr.io/wiiu-env/clang-format:13.0.0-2 -r ./source
|
docker run --rm -v ${PWD}:/src ghcr.io/wiiu-env/clang-format:13.0.0-2 -r ./source
|
||||||
|
@ -14,7 +14,7 @@ jobs:
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
needs: clang-format
|
needs: clang-format
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
- name: build lib
|
- name: build lib
|
||||||
run: |
|
run: |
|
||||||
docker build . -t tmp
|
docker build . -t tmp
|
||||||
|
|
2
.github/workflows/push_image.yml
vendored
2
.github/workflows/push_image.yml
vendored
|
@ -16,7 +16,7 @@ jobs:
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
- name: Extract Docker metadata
|
- name: Extract Docker metadata
|
||||||
id: meta
|
id: meta
|
||||||
uses: docker/metadata-action@v4
|
uses: docker/metadata-action@v4
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM ghcr.io/wiiu-env/devkitppc:20230621
|
FROM ghcr.io/wiiu-env/devkitppc:20240505
|
||||||
|
|
||||||
WORKDIR tmp_build
|
WORKDIR tmp_build
|
||||||
COPY . .
|
COPY . .
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
FROM ghcr.io/wiiu-env/devkitppc:20230621
|
FROM ghcr.io/wiiu-env/devkitppc:20240505
|
||||||
|
|
||||||
WORKDIR project
|
WORKDIR project
|
|
@ -44,8 +44,9 @@ extern "C" int curl_global_init() {
|
||||||
if (OSDynLoad_FindExport(sModuleHandle, OS_DYNLOAD_EXPORT_FUNC, "curl_version", (void **) &s_curl_version_tmp) == OS_DYNLOAD_OK) {
|
if (OSDynLoad_FindExport(sModuleHandle, OS_DYNLOAD_EXPORT_FUNC, "curl_version", (void **) &s_curl_version_tmp) == OS_DYNLOAD_OK) {
|
||||||
const char *expectedCURLVersion1 = "libcurl/7.84.0";
|
const char *expectedCURLVersion1 = "libcurl/7.84.0";
|
||||||
const char *expectedCURLVersion2 = "libcurl/8.0.1";
|
const char *expectedCURLVersion2 = "libcurl/8.0.1";
|
||||||
if (!std::string_view(s_curl_version_tmp()).starts_with(expectedCURLVersion1) && !std::string_view(s_curl_version_tmp()).starts_with(expectedCURLVersion2)) {
|
const char *expectedCURLVersion3 = "libcurl/8.7.1";
|
||||||
DEBUG_FUNCTION_LINE_WARN("Unexpected libcurl version: %s (expected %s)", s_curl_version_tmp(), expectedCURLVersion2);
|
if (!std::string_view(s_curl_version_tmp()).starts_with(expectedCURLVersion1) && !std::string_view(s_curl_version_tmp()).starts_with(expectedCURLVersion2) && !std::string_view(s_curl_version_tmp()).starts_with(expectedCURLVersion3)) {
|
||||||
|
DEBUG_FUNCTION_LINE_WARN("Unexpected libcurl version: %s (expected %s)", s_curl_version_tmp(), expectedCURLVersion3);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
DEBUG_FUNCTION_LINE_WARN("Failed to check curl_version");
|
DEBUG_FUNCTION_LINE_WARN("Failed to check curl_version");
|
||||||
|
@ -179,6 +180,7 @@ MAGIC_FUNCTION(void, curl_free, RETURN_VOID, arg1);
|
||||||
MAGIC_FUNCTION(int, curl_global_init_mem, CURLE_FAILED_INIT, arg1, arg2, arg3, arg4, arg5, arg6);
|
MAGIC_FUNCTION(int, curl_global_init_mem, CURLE_FAILED_INIT, arg1, arg2, arg3, arg4, arg5, arg6);
|
||||||
|
|
||||||
MAGIC_FUNCTION(int, curl_global_sslset, CURLSSLSET_NO_BACKENDS, arg1, arg2, arg3);
|
MAGIC_FUNCTION(int, curl_global_sslset, CURLSSLSET_NO_BACKENDS, arg1, arg2, arg3);
|
||||||
|
MAGIC_FUNCTION(int, curl_global_trace, CURLM_INTERNAL_ERROR, const char *config);
|
||||||
MAGIC_FUNCTION(void *, curl_slist_append, nullptr, arg1, arg2);
|
MAGIC_FUNCTION(void *, curl_slist_append, nullptr, arg1, arg2);
|
||||||
MAGIC_FUNCTION(void, curl_slist_free_all, RETURN_VOID, arg1);
|
MAGIC_FUNCTION(void, curl_slist_free_all, RETURN_VOID, arg1);
|
||||||
MAGIC_FUNCTION(time_t, curl_getdate, 0, arg1, arg2);
|
MAGIC_FUNCTION(time_t, curl_getdate, 0, arg1, arg2);
|
||||||
|
@ -198,6 +200,7 @@ MAGIC_FUNCTION_ARG0(void *, curl_multi_init, nullptr);
|
||||||
MAGIC_FUNCTION(int, curl_multi_add_handle, CURLM_INTERNAL_ERROR, arg1, arg2);
|
MAGIC_FUNCTION(int, curl_multi_add_handle, CURLM_INTERNAL_ERROR, arg1, arg2);
|
||||||
MAGIC_FUNCTION(int, curl_multi_remove_handle, CURLM_INTERNAL_ERROR, arg1, arg2);
|
MAGIC_FUNCTION(int, curl_multi_remove_handle, CURLM_INTERNAL_ERROR, arg1, arg2);
|
||||||
MAGIC_FUNCTION(int, curl_multi_fdset, CURLM_INTERNAL_ERROR, arg1, arg2, arg3, arg4, arg5);
|
MAGIC_FUNCTION(int, curl_multi_fdset, CURLM_INTERNAL_ERROR, arg1, arg2, arg3, arg4, arg5);
|
||||||
|
MAGIC_FUNCTION(void **, curl_multi_get_handles, nullptr, CURLM *multi_handle);
|
||||||
MAGIC_FUNCTION(int, curl_multi_wait, CURLM_INTERNAL_ERROR, arg1, arg2, arg3, arg4, arg5);
|
MAGIC_FUNCTION(int, curl_multi_wait, CURLM_INTERNAL_ERROR, arg1, arg2, arg3, arg4, arg5);
|
||||||
MAGIC_FUNCTION(int, curl_multi_poll, CURLM_INTERNAL_ERROR, arg1, arg2, arg3, arg4, arg5);
|
MAGIC_FUNCTION(int, curl_multi_poll, CURLM_INTERNAL_ERROR, arg1, arg2, arg3, arg4, arg5);
|
||||||
MAGIC_FUNCTION(int, curl_multi_wakeup, CURLM_INTERNAL_ERROR, arg1);
|
MAGIC_FUNCTION(int, curl_multi_wakeup, CURLM_INTERNAL_ERROR, arg1);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user