summaryrefslogtreecommitdiff
path: root/methods
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2007-07-10 15:06:12 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2007-07-10 15:06:12 -0300
commit21fd1746e37e695f569121c0b6489770ec6a8b0e (patch)
treebe77be5c85d4e30202aa43ef2fd657da9fabf7fd /methods
parentec5e7f30f3bd98749c4b11b4edd64bbb89c4dc15 (diff)
downloadapt-21fd1746e37e695f569121c0b6489770ec6a8b0e.tar.gz
* Fix compilation warnings:
- apt-pkg/contrib/configuration.cc: wrong argument type; - apt-pkg/deb/dpkgpm.cc: wrong signess; - apt-pkg-acquire-item.cc: wrong signess and orderned initializers; - methods/https.cc: - type conversion; - unused variable; - changed SetupProxy() method to void;
Diffstat (limited to 'methods')
-rw-r--r--methods/https.cc5
-rw-r--r--methods/https.h2
2 files changed, 3 insertions, 4 deletions
diff --git a/methods/https.cc b/methods/https.cc
index b758e4ab3..e62d51f1f 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -50,13 +50,13 @@ HttpsMethod::progress_callback(void *clientp, double dltotal, double dlnow,
{
HttpsMethod *me = (HttpsMethod *)clientp;
if(dltotal > 0 && me->Res.Size == 0) {
- me->Res.Size = dltotal;
+ me->Res.Size = (unsigned long)dltotal;
me->URIStart(me->Res);
}
return 0;
}
-bool HttpsMethod::SetupProxy()
+void HttpsMethod::SetupProxy()
{
URI ServerName = Queue->Uri;
@@ -84,7 +84,6 @@ bool HttpsMethod::SetupProxy()
}
// Determine what host and port to use based on the proxy settings
- int Port = 0;
string Host;
if (Proxy.empty() == true || Proxy.Host.empty() == true)
{
diff --git a/methods/https.h b/methods/https.h
index 6620a10fc..638c18193 100644
--- a/methods/https.h
+++ b/methods/https.h
@@ -29,7 +29,7 @@ class HttpsMethod : public pkgAcqMethod
static size_t write_data(void *buffer, size_t size, size_t nmemb, void *userp);
static int progress_callback(void *clientp, double dltotal, double dlnow,
double ultotal, double ulnow);
- bool SetupProxy();
+ void SetupProxy();
CURL *curl;
FetchResult Res;