Browse Source

move the users away from the deprecated StrToTime() method

debian/1.8.y
David Kalnischkies 12 years ago
parent
commit
96cc64a521
  1. 2
      apt-pkg/acquire-method.cc
  2. 4
      apt-pkg/contrib/strutl.h
  3. 3
      methods/ftp.cc
  4. 2
      methods/http.cc
  5. 3
      methods/rsh.cc

2
apt-pkg/acquire-method.cc

@ -373,7 +373,7 @@ int pkgAcqMethod::Run(bool Single)
Tmp->Uri = LookupTag(Message,"URI");
Tmp->DestFile = LookupTag(Message,"FileName");
if (StrToTime(LookupTag(Message,"Last-Modified"),Tmp->LastModified) == false)
if (RFC1123StrToTime(LookupTag(Message,"Last-Modified").c_str(),Tmp->LastModified) == false)
Tmp->LastModified = 0;
Tmp->IndexFile = StringToBool(LookupTag(Message,"Index-File"),false);
Tmp->Next = 0;

4
apt-pkg/contrib/strutl.h

@ -45,8 +45,8 @@ string Base64Encode(const string &Str);
string OutputInDepth(const unsigned long Depth, const char* Separator=" ");
string URItoFileName(const string &URI);
string TimeRFC1123(time_t Date);
bool RFC1123StrToTime(const char* const str,time_t &time) __attrib_const;
bool FTPMDTMStrToTime(const char* const str,time_t &time) __attrib_const;
bool RFC1123StrToTime(const char* const str,time_t &time) __must_check;
bool FTPMDTMStrToTime(const char* const str,time_t &time) __must_check;
__deprecated bool StrToTime(const string &Val,time_t &Result);
string LookupTag(const string &Message,const char *Tag,const char *Default = 0);
int StringToBool(const string &Text,int Default = -1);

3
methods/ftp.cc

@ -661,8 +661,7 @@ bool FTPConn::ModTime(const char *Path, time_t &Time)
return true;
// Parse it
StrToTime(Msg,Time);
return true;
return FTPMDTMStrToTime(Msg.c_str(), Time);
}
/*}}}*/
// FTPConn::CreateDataFd - Get a data connection /*{{{*/

2
methods/http.cc

@ -631,7 +631,7 @@ bool ServerState::HeaderLine(string Line)
if (stringcasecmp(Tag,"Last-Modified:") == 0)
{
if (StrToTime(Val,Date) == false)
if (RFC1123StrToTime(Val.c_str(), Date) == false)
return _error->Error(_("Unknown date format"));
return true;
}

3
methods/rsh.cc

@ -278,8 +278,7 @@ bool RSHConn::ModTime(const char *Path, time_t &Time)
return false;
// Parse it
StrToTime(Msg,Time);
return true;
return FTPMDTMStrToTime(Msg.c_str(), Time);
}
/*}}}*/
// RSHConn::Get - Get a file /*{{{*/

Loading…
Cancel
Save