fix program name detection in rsh method

[apt.git] / methods / https.cc

diff --git a/methods/https.cc b/methods/https.cc
index a159159105c8882136afe8d95e48b25dd2727e5a..a99b1861b92134a8727c0ecda27d50a868f07d7d 100644 (file)
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -49,7 +49,7 @@ size_t
 HttpsMethod::parse_header(void *buffer, size_t size, size_t nmemb, void *userp)
 {
    size_t len = size * nmemb;
 HttpsMethod::parse_header(void *buffer, size_t size, size_t nmemb, void *userp)
 {
    size_t len = size * nmemb;

-   CURLUserPointer *me = (CURLUserPointer *)userp;
+   CURLUserPointer *me = static_cast<CURLUserPointer *>(userp);

    std::string line((char*) buffer, len);
    for (--len; len > 0; --len)
       if (isspace(line[len]) == 0)
    std::string line((char*) buffer, len);
    for (--len; len > 0; --len)
       if (isspace(line[len]) == 0)


@@ -115,7 +115,7 @@ HttpsMethod::parse_header(void *buffer, size_t size, size_t nmemb, void *userp)
 size_t 
 HttpsMethod::write_data(void *buffer, size_t size, size_t nmemb, void *userp)
 {
 size_t 
 HttpsMethod::write_data(void *buffer, size_t size, size_t nmemb, void *userp)
 {

-   HttpsMethod *me = (HttpsMethod *)userp;
+   HttpsMethod *me = static_cast<HttpsMethod *>(userp);

    size_t buffer_size = size * nmemb;
    // we don't need to count the junk here, just drop anything we get as
    // we don't always know how long it would be, e.g. in chunked encoding.
    size_t buffer_size = size * nmemb;
    // we don't need to count the junk here, just drop anything we get as
    // we don't always know how long it would be, e.g. in chunked encoding.


@@ -443,7 +443,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
    // server says file not modified
    if (Server->Result == 304 || curl_condition_unmet == 1)
    {
    // server says file not modified
    if (Server->Result == 304 || curl_condition_unmet == 1)
    {

-      unlink(File->Name().c_str());
+      RemoveFile("https", File->Name());

       Res.IMSHit = true;
       Res.LastModified = Itm->LastModified;
       Res.Size = 0;
       Res.IMSHit = true;
       Res.LastModified = Itm->LastModified;
       Res.Size = 0;


@@ -461,14 +461,14 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
       SetFailReason(err);
       _error->Error("%i %s", Server->Result, Server->Code);
       // unlink, no need keep 401/404 page content in partial/
       SetFailReason(err);
       _error->Error("%i %s", Server->Result, Server->Code);
       // unlink, no need keep 401/404 page content in partial/

-      unlink(File->Name().c_str());
+      RemoveFile("https", File->Name());

       return false;
    }
 
    // invalid range-request
    if (Server->Result == 416)
    {
       return false;
    }
 
    // invalid range-request
    if (Server->Result == 416)
    {

-      unlink(File->Name().c_str());
+      RemoveFile("https", File->Name());

       delete File;
       Redirect(Itm->Uri);
       return true;
       delete File;
       Redirect(Itm->Uri);
       return true;