releasing 1.1~exp14

[apt.git] / methods / connect.cc

diff --git a/methods/connect.cc b/methods/connect.cc
index dd45e7203553e29e8b55774dc39af79dafca5b42..171622fa570d31a2813dd2f5be4d4ee259e45f2e 100644 (file)
--- a/methods/connect.cc
+++ b/methods/connect.cc
@@ -45,7 +45,6 @@ static struct addrinfo *LastHostAddr = 0;
 static struct addrinfo *LastUsed = 0;
 
 static std::vector<SrvRec> SrvRecords;
 static struct addrinfo *LastUsed = 0;
 
 static std::vector<SrvRec> SrvRecords;

-static int LastSrvRecord = 0;

 
 // Set of IP/hostnames that we timed out before or couldn't resolve
 static std::set<std::string> bad_addr;
 
 // Set of IP/hostnames that we timed out before or couldn't resolve
 static std::set<std::string> bad_addr;


@@ -134,11 +133,10 @@ static bool DoConnect(struct addrinfo *Addr,std::string Host,
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-
-// Connect to a given Hostname 
-bool ConnectToHostname(std::string Host,int Port,const char *Service,
-                            int DefPort,int &Fd,
-                            unsigned long TimeOut,pkgAcqMethod *Owner)
+// Connect to a given Hostname                                         /*{{{*/
+static bool ConnectToHostname(std::string const &Host, int const Port,
+      const char * const Service, int DefPort, int &Fd,
+      unsigned long const TimeOut, pkgAcqMethod * const Owner)

 {
    // Convert the port name/number
    char ServStr[300];
 {
    // Convert the port name/number
    char ServStr[300];