From b371821db59d33851d521d66ba1fb126d388c00f Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sun, 24 May 2020 23:36:49 +0100 Subject: chore(3p/nix/libstore): Remove progress bar remnants from download --- third_party/nix/src/libstore/download.cc | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'third_party/nix/src/libstore') diff --git a/third_party/nix/src/libstore/download.cc b/third_party/nix/src/libstore/download.cc index c96caf474c..a83599715c 100644 --- a/third_party/nix/src/libstore/download.cc +++ b/third_party/nix/src/libstore/download.cc @@ -215,21 +215,6 @@ struct CurlDownloader : public Downloader { return ((DownloadItem*)userp)->headerCallback(contents, size, nmemb); } - static int progressCallback(double dltotal, double dlnow) { - try { - // TODO(tazjin): this had activity nonsense, clean it up - } catch (nix::Interrupted&) { - assert(_isInterrupted); - } - return static_cast(_isInterrupted); - } - - static int progressCallbackWrapper(void* userp, double dltotal, - double dlnow, double ultotal, - double ulnow) { - return ((DownloadItem*)userp)->progressCallback(dltotal, dlnow); - } - static int debugCallback(CURL* handle, curl_infotype type, char* data, size_t size, void* userptr) { if (type == CURLINFO_TEXT) { @@ -298,10 +283,6 @@ struct CurlDownloader : public Downloader { DownloadItem::headerCallbackWrapper); curl_easy_setopt(req, CURLOPT_HEADERDATA, this); - curl_easy_setopt(req, CURLOPT_PROGRESSFUNCTION, progressCallbackWrapper); - curl_easy_setopt(req, CURLOPT_PROGRESSDATA, this); - curl_easy_setopt(req, CURLOPT_NOPROGRESS, 0); - curl_easy_setopt(req, CURLOPT_HTTPHEADER, requestHeaders); if (request.head) { -- cgit 1.4.1