diff options
| author | Andrew Paprocki <andrew@ishiboo.com> | 2022-12-21 11:15:00 -0500 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@redhat.com> | 2022-12-21 11:39:25 -0500 |
| commit | d2bf497b12fbd49b4996ccf0744303ffd67735b1 (patch) | |
| tree | 50e0d8d15f2e8e75c6080965c1fbdec0d5573d80 | |
| parent | 6ecd16410ce1fe5cb0ac5b7c3342c5cc330e3a04 (diff) | |
| download | elfutils-d2bf497b12fbd49b4996ccf0744303ffd67735b1.tar.gz | |
PR29926: debuginfod: Fix usage of deprecated CURLINFO_*
The `CURLINFO_SIZE_DOWNLOAD_T` and `CURLINFO_CONTENT_LENGTH_DOWNLOAD_T`
identifiers are `enum`s, not pre-processor definitions, so the current
`#ifdef` logic is not selecting the newer API. This results in the
older identifiers being used and they now generate errors when compiled
against Curl 7.87, which has silently deprecated them, causing GCC to
emit `-Werror=deprecated-declarations`.
Instead, the newer identifiers were added in Curl 7.55, so explicitly
check for `CURL_AT_LEAST_VERSION(7, 55, 0)` instead of the current
logic. This eliminates the error when compiling against Curl 7.87.
Ref: https://github.com/curl/curl/pull/1511
Signed-off-by: Andrew Paprocki <andrew@ishiboo.com>
| -rw-r--r-- | debuginfod/ChangeLog | 4 | ||||
| -rw-r--r-- | debuginfod/debuginfod-client.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/debuginfod/ChangeLog b/debuginfod/ChangeLog index a7afed94..2c65d862 100644 --- a/debuginfod/ChangeLog +++ b/debuginfod/ChangeLog @@ -1,3 +1,7 @@ +2022-12-21 Andrew Paprocki <andrew@ishiboo.com> + + * debuginfod-client.c: Make compilable against newer curl. PR29926 + 2022-11-15 Mark Wielaard <mark@klomp.org> * debuginfod-client.c (debuginfod_query_server): Initialize diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c index 8873fcc8..692aecce 100644 --- a/debuginfod/debuginfod-client.c +++ b/debuginfod/debuginfod-client.c @@ -1456,7 +1456,7 @@ debuginfod_query_server (debuginfod_client *c, deflate-compressing proxies, this number is likely to be unavailable, so -1 may show. */ CURLcode curl_res; -#ifdef CURLINFO_CONTENT_LENGTH_DOWNLOAD_T +#if CURL_AT_LEAST_VERSION(7, 55, 0) curl_off_t cl; curl_res = curl_easy_getinfo(target_handle, CURLINFO_CONTENT_LENGTH_DOWNLOAD_T, @@ -1491,7 +1491,7 @@ debuginfod_query_server (debuginfod_client *c, if (target_handle) /* we've committed to a server; report its download progress */ { CURLcode curl_res; -#ifdef CURLINFO_SIZE_DOWNLOAD_T +#if CURL_AT_LEAST_VERSION(7, 55, 0) curl_off_t dl; curl_res = curl_easy_getinfo(target_handle, CURLINFO_SIZE_DOWNLOAD_T, |