X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/f5c0ab925fdceb1bc0ef0e958cae7d0fafb28caf..af9e40c9bfb353b8aea1e2621b3b5a8c1c1db4bd:/methods/connect.cc diff --git a/methods/connect.cc b/methods/connect.cc index 5612af6ec..171622fa5 100644 --- 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 SrvRecords; -static int LastSrvRecord = 0; // Set of IP/hostnames that we timed out before or couldn't resolve static std::set bad_addr; @@ -134,11 +133,10 @@ static bool DoConnect(struct addrinfo *Addr,std::string Host, 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]; @@ -272,7 +270,7 @@ bool Connect(std::string Host,int Port,const char *Service, if(LastHost != Host || LastPort != Port) { SrvRecords.clear(); - if (_config->FindB("Acquire::EnableSrvRecods", true) == true) + if (_config->FindB("Acquire::EnableSrvRecords", true) == true) GetSrvRecords(Host, DefPort, SrvRecords); } // we have no SrvRecords for this host, connect right away