move the users away from the deprecated StrToTime() method

diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc
index fe066741c4456fc7dd0f35bdd59705d125919d80..b82dceecb4997175b30ffbaf4552cd752c4b99e6 100644 (file)
--- a/apt-pkg/acquire-method.cc
+++ b/apt-pkg/acquire-method.cc
@@ -373,7 +373,7 @@ int pkgAcqMethod::Run(bool Single)
            
            Tmp->Uri = LookupTag(Message,"URI");
            Tmp->DestFile = LookupTag(Message,"FileName");
            
            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;
               Tmp->LastModified = 0;
            Tmp->IndexFile = StringToBool(LookupTag(Message,"Index-File"),false);
            Tmp->Next = 0;

diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index b5de0802ecf7fa50191ff6b698a6303619518442..a457ff047da314d428bca60455ebfac643e192b2 100644 (file)
--- a/apt-pkg/contrib/strutl.h
+++ b/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);
 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);
 __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);

diff --git a/methods/ftp.cc b/methods/ftp.cc
index 3e1725823d9a16e98b20adcfe73434723d79cbde..97248f900c8eaff56f46e721a6f4958e11576c20 100644 (file)
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -661,8 +661,7 @@ bool FTPConn::ModTime(const char *Path, time_t &Time)
       return true;
    
    // Parse it
       return true;
    
    // Parse it

-   StrToTime(Msg,Time);
-   return true;
+   return FTPMDTMStrToTime(Msg.c_str(), Time);

 }
                                                                        /*}}}*/
 // FTPConn::CreateDataFd - Get a data connection                       /*{{{*/
 }
                                                                        /*}}}*/
 // FTPConn::CreateDataFd - Get a data connection                       /*{{{*/

diff --git a/methods/http.cc b/methods/http.cc
index d43dd14c89242818514a74f186d62477f352b637..5fdc62696d2b2ca46116dfedafb06415051a8935 100644 (file)
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -631,7 +631,7 @@ bool ServerState::HeaderLine(string Line)
    
    if (stringcasecmp(Tag,"Last-Modified:") == 0)
    {
    
    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;
    }
         return _error->Error(_("Unknown date format"));
       return true;
    }

diff --git a/methods/rsh.cc b/methods/rsh.cc
index f0ccfc42d2890513c0b5048943915da75afcc184..97b4ef1518b24e52a6229d2804a4d7a4dd1ce3df 100644 (file)
--- a/methods/rsh.cc
+++ b/methods/rsh.cc
@@ -278,8 +278,7 @@ bool RSHConn::ModTime(const char *Path, time_t &Time)
       return false;
 
    // Parse it
       return false;
 
    // Parse it

-   StrToTime(Msg,Time);
-   return true;
+   return FTPMDTMStrToTime(Msg.c_str(), Time);

 }
                                                                        /*}}}*/
 // RSHConn::Get - Get a file                                           /*{{{*/
 }
                                                                        /*}}}*/
 // RSHConn::Get - Get a file                                           /*{{{*/