Remove some more unused functions

Final ABI cleanup before unstable?!

2 files changed, 0 insertions, 51 deletions

diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index ea70ae581..5be6f00ce 100644
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -235,41 +235,6 @@ char *_strrstrip(char *String)
    return String;
 }
 									/*}}}*/
-// strtabexpand - Converts tabs into 8 spaces				/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-char *_strtabexpand(char *String,size_t Len)
-{
-   for (char *I = String; I != I + Len && *I != 0; I++)
-   {
-      if (*I != '\t')
-	 continue;
-      if (I + 8 > String + Len)
-      {
-	 *I = 0;
-	 return String;
-      }
-
-      /* Assume the start of the string is 0 and find the next 8 char
-         division */
-      int Len;
-      if (String == I)
-	 Len = 1;
-      else
-	 Len = 8 - ((String - I) % 8);
-      Len -= 2;
-      if (Len <= 0)
-      {
-	 *I = ' ';
-	 continue;
-      }
-      
-      memmove(I + Len,I + 1,strlen(I) + 1);
-      for (char *J = I; J + Len != I; *I = ' ', I++);
-   }
-   return String;
-}
-									/*}}}*/
 // ParseQuoteWord - Parse a single word out of a string			/*{{{*/
 // ---------------------------------------------------------------------
 /* This grabs a single word, converts any % escaped characters to their
@@ -1183,20 +1148,6 @@ bool RFC1123StrToTime(std::string const &str,time_t &time)
    return true;
 }
 									/*}}}*/
-// FTPMDTMStrToTime - Converts a ftp modification date into a time_t	/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool FTPMDTMStrToTime(const char* const str,time_t &time)
-{
-   struct tm Tm;
-   // MDTM includes no whitespaces but recommend and ignored by strptime
-   if (strptime(str, "%Y %m %d %H %M %S", &Tm) == NULL)
-      return false;
-
-   time = timegm(&Tm);
-   return true;
-}
-									/*}}}*/
 // StrToNum - Convert a fixed length string to a number			/*{{{*/
 // ---------------------------------------------------------------------
 /* This is used in decoding the crazy fixed length string headers in
diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index 92df7c9d3..79b7c8bfa 100644
--- a/apt-pkg/contrib/strutl.h
+++ b/apt-pkg/contrib/strutl.h
@@ -55,7 +55,6 @@ namespace APT {
 APT_PUBLIC bool UTF8ToCodeset(const char *codeset, const std::string &orig, std::string *dest);
 APT_PUBLIC char *_strstrip(char *String);
 APT_PUBLIC char *_strrstrip(char *String); // right strip only
-[[deprecated("Use SubstVar to avoid memory headaches")]] APT_PUBLIC char *_strtabexpand(char *String,size_t Len);
 APT_PUBLIC bool ParseQuoteWord(const char *&String,std::string &Res);
 APT_PUBLIC bool ParseCWord(const char *&String,std::string &Res);
 APT_PUBLIC std::string QuoteString(const std::string &Str,const char *Bad);
@@ -97,7 +96,6 @@ APT_PUBLIC std::string TimeRFC1123(time_t Date, bool const NumericTimezone);
  * @return \b true if parsing was successful, otherwise \b false.
  */
 [[nodiscard]] APT_PUBLIC bool RFC1123StrToTime(const std::string &str,time_t &time);
-[[nodiscard, deprecated("Unused and untested in src:apt")]] APT_PUBLIC bool FTPMDTMStrToTime(const char *str, time_t &time);
 APT_PUBLIC std::string LookupTag(const std::string &Message,const char *Tag,const char *Default = 0);
 APT_PUBLIC int StringToBool(const std::string &Text,int Default = -1);
 APT_PUBLIC bool ReadMessages(int Fd, std::vector<std::string> &List);