Merge pull request #12566 from NaN-git/fix-curl-callback

libstore: fix curl callback function signature
NixOS · Feb 25, 2025 · 81834e7 · 81834e7
2 parents 671d1b0 + b074345
commit 81834e7
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/libstore/filetransfer.cc b/src/libstore/filetransfer.cc
@@ -261,7 +261,7 @@ struct curlFileTransfer : public FileTransfer
             return ((TransferItem *) userp)->headerCallback(contents, size, nmemb);
         }
 
-        int progressCallback(double dltotal, double dlnow)
+        int progressCallback(curl_off_t dltotal, curl_off_t dlnow)
         {
             try {
                 act.progress(dlnow, dltotal);
@@ -271,17 +271,17 @@ struct curlFileTransfer : public FileTransfer
             return getInterrupted();
         }
 
-        int silentProgressCallback(double dltotal, double dlnow)
+        int silentProgressCallback(curl_off_t dltotal, curl_off_t dlnow)
         {
             return getInterrupted();
         }
 
-        static int progressCallbackWrapper(void * userp, double dltotal, double dlnow, double ultotal, double ulnow)
+        static int progressCallbackWrapper(void * userp, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow)
         {
             return ((TransferItem *) userp)->progressCallback(dltotal, dlnow);
         }
 
-        static int silentProgressCallbackWrapper(void * userp, double dltotal, double dlnow, double ultotal, double ulnow)
+        static int silentProgressCallbackWrapper(void * userp, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow)
         {
             return ((TransferItem *) userp)->silentProgressCallback(dltotal, dlnow);
         }