From: Andrew Paprocki Date: Wed, 21 Dec 2022 16:15:00 +0000 (-0500) Subject: PR29926: debuginfod: Fix usage of deprecated CURLINFO_* X-Git-Tag: elfutils-0.189~50 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d2bf497b12fbd49b4996ccf0744303ffd67735b1;p=thirdparty%2Felfutils.git 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 --- diff --git a/debuginfod/ChangeLog b/debuginfod/ChangeLog index a7afed94e..2c65d8626 100644 --- a/debuginfod/ChangeLog +++ b/debuginfod/ChangeLog @@ -1,3 +1,7 @@ +2022-12-21 Andrew Paprocki + + * debuginfod-client.c: Make compilable against newer curl. PR29926 + 2022-11-15 Mark Wielaard * debuginfod-client.c (debuginfod_query_server): Initialize diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c index 8873fcc8c..692aeccec 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,