]> git.ipfire.org Git - thirdparty/systemd.git/commit
import: use CURLOPT_PROTOCOLS_STR with libcurl >= 7.85.0 25982/head
authorFrantisek Sumsal <frantisek@sumsal.cz>
Mon, 9 Jan 2023 11:44:28 +0000 (12:44 +0100)
committerFrantisek Sumsal <frantisek@sumsal.cz>
Mon, 9 Jan 2023 12:36:42 +0000 (13:36 +0100)
commite61a4c0b7c79eabbe4eb50ff2e663734fde769f0
treec2130499981d0a0c72e92129bf86107a09070144
parent2285c462ebb0b5d9a7043719a4f0d684a5dc37c2
import: use CURLOPT_PROTOCOLS_STR with libcurl >= 7.85.0

CURLOPT_PROTOCOLS [0] was deprecated in libcurl 7.85.0 with
CURLOPT_PROTOCOLS_STR [1] as a replacement, causing build warnings/errors:

../build/src/import/curl-util.c: In function ‘curl_glue_make’:
../build/src/import/curl-util.c:255:9: error: ‘CURLOPT_PROTOCOLS’ is deprecated: since 7.85.0. Use CURLOPT_PROTOCOLS_STR [-Werror=deprecated-declarations]
  255 |         if (curl_easy_setopt(c, CURLOPT_PROTOCOLS, CURLPROTO_HTTP|CURLPROTO_HTTPS|CURLPROTO_FILE) != CURLE_OK)
      |         ^~
In file included from ../build/src/import/curl-util.h:4,
                 from ../build/src/import/curl-util.c:6:
/usr/include/curl/curl.h:1749:3: note: declared here
 1749 |   CURLOPTDEPRECATED(CURLOPT_PROTOCOLS, CURLOPTTYPE_LONG, 181,
      |   ^~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors

Since there's no grace period between the two symbols, let's resort
to a light if-def-ery to resolve this.

[0] https://curl.se/libcurl/c/CURLOPT_PROTOCOLS.html
[1] https://curl.se/libcurl/c/CURLOPT_PROTOCOLS_STR.html
src/import/curl-util.c