warning: extra ‘;’ [-Wpedantic]

[apt.git] / methods / http.cc

diff --git a/methods/http.cc b/methods/http.cc
index 71a02e53a062e3a7bae2f22dd63dbfea34bdf2c0..16c6d19e131391bc94acb83e9011b9eedf281fb8 100644 (file)
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -3,7 +3,7 @@
 // $Id: http.cc,v 1.59 2004/05/08 19:42:35 mdz Exp $
 /* ######################################################################
 
 // $Id: http.cc,v 1.59 2004/05/08 19:42:35 mdz Exp $
 /* ######################################################################
 

-   HTTP Acquire Method - This is the HTTP aquire method for APT.
+   HTTP Acquire Method - This is the HTTP acquire method for APT.

    
    It uses HTTP/1.1 and many of the fancy options there-in, such as
    pipelining, range, if-range and so on. 
    
    It uses HTTP/1.1 and many of the fancy options there-in, such as
    pipelining, range, if-range and so on. 


@@ -36,7 +36,6 @@
 
 #include <sys/stat.h>
 #include <sys/time.h>
 
 #include <sys/stat.h>
 #include <sys/time.h>

-#include <utime.h>

 #include <unistd.h>
 #include <signal.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <signal.h>
 #include <stdio.h>


@@ -62,7 +61,7 @@ unsigned long long CircleBuf::BwReadLimit=0;
 unsigned long long CircleBuf::BwTickReadData=0;
 struct timeval CircleBuf::BwReadTick={0,0};
 const unsigned int CircleBuf::BW_HZ=10;
 unsigned long long CircleBuf::BwTickReadData=0;
 struct timeval CircleBuf::BwReadTick={0,0};
 const unsigned int CircleBuf::BW_HZ=10;

- 
+

 // CircleBuf::CircleBuf - Circular input buffer                                /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // CircleBuf::CircleBuf - Circular input buffer                                /*{{{*/
 // ---------------------------------------------------------------------
 /* */


@@ -88,8 +87,8 @@ void CircleBuf::Reset()
    {
       delete Hash;
       Hash = new Hashes;
    {
       delete Hash;
       Hash = new Hashes;

-   }   
-};
+   }
+}

                                                                        /*}}}*/
 // CircleBuf::Read - Read from a FD into the circular buffer           /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // CircleBuf::Read - Read from a FD into the circular buffer           /*{{{*/
 // ---------------------------------------------------------------------


@@ -97,8 +96,6 @@ void CircleBuf::Reset()
    is non-blocking.. */
 bool CircleBuf::Read(int Fd)
 {
    is non-blocking.. */
 bool CircleBuf::Read(int Fd)
 {

-   unsigned long long BwReadMax;
-

    while (1)
    {
       // Woops, buffer is full
    while (1)
    {
       // Woops, buffer is full


@@ -106,7 +103,7 @@ bool CircleBuf::Read(int Fd)
         return true;
 
       // what's left to read in this tick
         return true;
 
       // what's left to read in this tick

-      BwReadMax = CircleBuf::BwReadLimit/BW_HZ;
+      unsigned long long const BwReadMax = CircleBuf::BwReadLimit/BW_HZ;

 
       if(CircleBuf::BwReadLimit) {
         struct timeval now;
 
       if(CircleBuf::BwReadLimit) {
         struct timeval now;


@@ -735,7 +732,7 @@ void HttpMethod::SendReq(FetchItem *Itm)
    }
 
    // If we ask for uncompressed files servers might respond with content-
    }
 
    // If we ask for uncompressed files servers might respond with content-

-   // negotation which lets us end up with compressed files we do not support,
+   // negotiation which lets us end up with compressed files we do not support,

    // see 657029, 657560 and co, so if we have no extension on the request
    // ask for text only. As a sidenote: If there is nothing to negotate servers
    // seem to be nice and ignore it.
    // see 657029, 657560 and co, so if we have no extension on the request
    // ask for text only. As a sidenote: If there is nothing to negotate servers
    // seem to be nice and ignore it.


@@ -798,7 +795,6 @@ bool HttpMethod::Configuration(string Message)
    PipelineDepth = _config->FindI("Acquire::http::Pipeline-Depth",
                                  PipelineDepth);
    Debug = _config->FindB("Debug::Acquire::http",false);
    PipelineDepth = _config->FindI("Acquire::http::Pipeline-Depth",
                                  PipelineDepth);
    Debug = _config->FindB("Debug::Acquire::http",false);

-   AutoDetectProxyCmd = _config->Find("Acquire::http::ProxyAutoDetect");

 
    // Get the proxy to use
    AutoDetectProxy();
 
    // Get the proxy to use
    AutoDetectProxy();


@@ -811,6 +807,11 @@ bool HttpMethod::Configuration(string Message)
 /* */
 bool HttpMethod::AutoDetectProxy()
 {
 /* */
 bool HttpMethod::AutoDetectProxy()
 {

+   // option is "Acquire::http::Proxy-Auto-Detect" but we allow the old
+   // name without the dash ("-")
+   AutoDetectProxyCmd = _config->Find("Acquire::http::Proxy-Auto-Detect",
+                                      _config->Find("Acquire::http::ProxyAutoDetect"));
+

    if (AutoDetectProxyCmd.empty())
       return true;
 
    if (AutoDetectProxyCmd.empty())
       return true;