about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-24T22·36+0100
committerVincent Ambo <tazjin@google.com>2020-05-24T22·36+0100
commitb371821db59d33851d521d66ba1fb126d388c00f (patch)
treef89a51fc01573912fafa56f30eb8e5a08c1b3630
parentf5aaa12f1d0f59c9953692a5df1959b82fcbb88a (diff)
chore(3p/nix/libstore): Remove progress bar remnants from download r/842
-rw-r--r--third_party/nix/src/libstore/download.cc19
1 files changed, 0 insertions, 19 deletions
diff --git a/third_party/nix/src/libstore/download.cc b/third_party/nix/src/libstore/download.cc
index c96caf474c0d..a83599715c1e 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<int>(_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) {