diff options
| author | Michael Vogt <mvo@debian.org> | 2014-04-01 13:57:22 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-04-01 13:57:22 +0200 |
| commit | 8a1c9010137a8c49d9808f2db34b9ee277138986 (patch) | |
| tree | 5ec5c0103cb896407d8c9542fac0ec8ab3313602 /methods/https.cc | |
| parent | fa55ccaa85ca8f85251300f5c5f574edc0c3ca71 (diff) | |
| parent | 417e83d0d79637266e04c98189c62ce85bcdf737 (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
apt-pkg/deb/dpkgpm.cc
debian/apt.auto-removal.sh
debian/changelog
vendor/debian/sources.list.in
Diffstat (limited to 'methods/https.cc')
| -rw-r--r-- | methods/https.cc | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/methods/https.cc b/methods/https.cc index febe6a0f0..c4aff8f38 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -18,19 +18,20 @@ #include <apt-pkg/hashes.h> #include <apt-pkg/netrc.h> #include <apt-pkg/configuration.h> +#include <apt-pkg/macros.h> +#include <apt-pkg/strutl.h> #include <sys/stat.h> #include <sys/time.h> #include <unistd.h> -#include <signal.h> #include <stdio.h> -#include <errno.h> -#include <string.h> #include <iostream> #include <sstream> +#include <ctype.h> +#include <stdlib.h> -#include "config.h" #include "https.h" + #include <apti18n.h> /*}}}*/ using namespace std; @@ -83,9 +84,9 @@ HttpsMethod::write_data(void *buffer, size_t size, size_t nmemb, void *userp) return size*nmemb; } -int -HttpsMethod::progress_callback(void *clientp, double dltotal, double dlnow, - double ultotal, double ulnow) +int +HttpsMethod::progress_callback(void *clientp, double dltotal, double /*dlnow*/, + double /*ultotal*/, double /*ulnow*/) { HttpsMethod *me = (HttpsMethod *)clientp; if(dltotal > 0 && me->Res.Size == 0) { @@ -95,7 +96,7 @@ HttpsMethod::progress_callback(void *clientp, double dltotal, double dlnow, } // HttpsServerState::HttpsServerState - Constructor /*{{{*/ -HttpsServerState::HttpsServerState(URI Srv,HttpsMethod *Owner) : ServerState(Srv, NULL) +HttpsServerState::HttpsServerState(URI Srv,HttpsMethod * /*Owner*/) : ServerState(Srv, NULL) { TimeOut = _config->FindI("Acquire::https::Timeout",TimeOut); Reset(); @@ -432,7 +433,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm) delete File; return true; -}; +} int main() { |