From 88ca02da4e01a5b170513829347bc5c0fd13c47e Mon Sep 17 00:00:00 2001 From: bbhtt Date: Sat, 16 May 2026 12:50:46 +0530 Subject: [PATCH 1/2] builder-flatpak-utils: Use long for curl_easy_setopt parameters See [1], [2]. GCC lets this slide but Clang does not and causes a Wattribute-warning. [1]: https://curl.se/libcurl/c/curl_easy_setopt.html [2]: https://github.com/curl/curl/blob/e8c1023b00b4b1491d0436f8bc95fe589ad659ed/include/curl/typecheck-gcc.h#L650-L655 --- src/builder-flatpak-utils.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/builder-flatpak-utils.c b/src/builder-flatpak-utils.c index 927bdade..2b3f781f 100644 --- a/src/builder-flatpak-utils.c +++ b/src/builder-flatpak-utils.c @@ -1163,11 +1163,11 @@ flatpak_create_curl_session (const char *user_agent) if (curl_session == NULL) return NULL; - curl_easy_setopt (curl_session, CURLOPT_CONNECTTIMEOUT, 60); - curl_easy_setopt (curl_session, CURLOPT_FAILONERROR, 1); - curl_easy_setopt (curl_session, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt (curl_session, CURLOPT_MAXREDIRS, 50); - curl_easy_setopt (curl_session, CURLOPT_NOPROGRESS, 0); + curl_easy_setopt (curl_session, CURLOPT_CONNECTTIMEOUT, 60L); + curl_easy_setopt (curl_session, CURLOPT_FAILONERROR, 1L); + curl_easy_setopt (curl_session, CURLOPT_FOLLOWLOCATION, 1L); + curl_easy_setopt (curl_session, CURLOPT_MAXREDIRS, 50L); + curl_easy_setopt (curl_session, CURLOPT_NOPROGRESS, 0L); curl_easy_setopt (curl_session, CURLOPT_LOW_SPEED_TIME, 60L); curl_easy_setopt (curl_session, CURLOPT_LOW_SPEED_LIMIT, 10000L); curl_easy_setopt (curl_session, CURLOPT_USERAGENT, user_agent); From 4f59bf7da69dea276281783261b20f126d1fb1de Mon Sep 17 00:00:00 2001 From: bbhtt Date: Sat, 16 May 2026 12:59:34 +0530 Subject: [PATCH 2/2] builder-utils: Fix type signature of curl write callback gpointer * is void ** which does not match the expected type signature of the params in the typecheck macro [1], [2]. GCC lets this slide but Clang causes a -Wattribute-warning. [1]: https://github.com/curl/curl/blob/e8c1023b00b4b1491d0436f8bc95fe589ad659ed/include/curl/typecheck-gcc.h#L734 [2]: https://curl.se/libcurl/c/CURLOPT_WRITEFUNCTION.html --- src/builder-utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/builder-utils.c b/src/builder-utils.c index e869692e..01d981b5 100644 --- a/src/builder-utils.c +++ b/src/builder-utils.c @@ -1151,10 +1151,10 @@ typedef struct { } CURLWriteData; static gsize -builder_curl_write_cb (gpointer *buffer, +builder_curl_write_cb (char *buffer, gsize size, gsize nmemb, - gpointer *userdata) + void *userdata) { gsize bytes_written; CURLWriteData *write_data = (CURLWriteData *) userdata;