Skip to content

Fix some curl type issues #741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bbhtt merged 2 commits into from
May 19, 2026
Merged

Fix some curl type issues #741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88ca02d
builder-flatpak-utils: Use long for curl_easy_setopt parameters
bbhtt May 16, 2026
4f59bf7
builder-utils: Fix type signature of curl write callback
bbhtt May 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/builder-flatpak-utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions src/builder-utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down