Skip to content

Commit 81834e7

Browse files
authored
Merge pull request #12566 from NaN-git/fix-curl-callback
libstore: fix curl callback function signature
2 parents 671d1b0 + b074345 commit 81834e7

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/libstore/filetransfer.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ struct curlFileTransfer : public FileTransfer
261261
return ((TransferItem *) userp)->headerCallback(contents, size, nmemb);
262262
}
263263

264-
int progressCallback(double dltotal, double dlnow)
264+
int progressCallback(curl_off_t dltotal, curl_off_t dlnow)
265265
{
266266
try {
267267
act.progress(dlnow, dltotal);
@@ -271,17 +271,17 @@ struct curlFileTransfer : public FileTransfer
271271
return getInterrupted();
272272
}
273273

274-
int silentProgressCallback(double dltotal, double dlnow)
274+
int silentProgressCallback(curl_off_t dltotal, curl_off_t dlnow)
275275
{
276276
return getInterrupted();
277277
}
278278

279-
static int progressCallbackWrapper(void * userp, double dltotal, double dlnow, double ultotal, double ulnow)
279+
static int progressCallbackWrapper(void * userp, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow)
280280
{
281281
return ((TransferItem *) userp)->progressCallback(dltotal, dlnow);
282282
}
283283

284-
static int silentProgressCallbackWrapper(void * userp, double dltotal, double dlnow, double ultotal, double ulnow)
284+
static int silentProgressCallbackWrapper(void * userp, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow)
285285
{
286286
return ((TransferItem *) userp)->silentProgressCallback(dltotal, dlnow);
287287
}

0 commit comments

Comments
 (0)