fix typos in changelog, make DeEscapeString const, improve description

diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index e998d74dc157a311daf12dcfdafb5286a8d5079d..ab2da2d9af11a9b21ed9930b5ec76869754efef1 100644 (file)
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -1240,10 +1240,10 @@ bool CheckDomainList(const string &Host,const string &List)
    return false;
 }
                                                                        /*}}}*/
    return false;
 }
                                                                        /*}}}*/

-// ProcessEscapeSequences                                              /*{{{*/
+// DeEscapeString - unescape (\0XX and \xXX) from a string             /*{{{*/

 // ---------------------------------------------------------------------
 // ---------------------------------------------------------------------

-/* unescape (\0XX and \xXX) from a string */
-string DeEscapeString(string &input)
+/* */
+string DeEscapeString(const string &input)

 {
    char tmp[3];
    string::const_iterator it, escape_start;
 {
    char tmp[3];
    string::const_iterator it, escape_start;

diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index 2a6bc1990dcec3e99480f3e4a7d52c183bcd856c..fba85cf94382d888d0aa11cbe46daf0d93774fe1 100644 (file)
--- a/apt-pkg/contrib/strutl.h
+++ b/apt-pkg/contrib/strutl.h
@@ -41,7 +41,7 @@ string DeQuoteString(const string &Str);
 string DeQuoteString(string::const_iterator const &begin, string::const_iterator const &end);
 
 // unescape (\0XX and \xXX) from a string
 string DeQuoteString(string::const_iterator const &begin, string::const_iterator const &end);
 
 // unescape (\0XX and \xXX) from a string

-string DeEscapeString(string &input);
+string DeEscapeString(const string &input);

 
 string SizeToStr(double Bytes);
 string TimeToStr(unsigned long Sec);
 
 string SizeToStr(double Bytes);
 string TimeToStr(unsigned long Sec);

diff --git a/debian/changelog b/debian/changelog
index f620bd87141118a8a3d22b8e117f8b6af4674f44..0f8035a78a7a14c079e2ccc78298b2caafe19b0d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@ apt (0.8.15.2) unstable; urgency=high
   * apt-pkg/contrib/cdromutl.cc:
     - fix escape problem when looking for the mounted devices
   * apt-pkg/contrib/strutl.{h,cc}, test/libapt/strutil_test.cc:
   * apt-pkg/contrib/cdromutl.cc:
     - fix escape problem when looking for the mounted devices
   * apt-pkg/contrib/strutl.{h,cc}, test/libapt/strutil_test.cc:

-    - add new DeEscapeString() similar to DeQuoteQuotedWord but
-      unescape charackter escapes like \0XXX and \xXX (plus add test)
+    - add new DeEscapeString() similar to DeQuoteString but
+      unescape character escapes like \0XX and \xXX (plus added
+      test)

 
  -- Michael Vogt <mvo@debian.org>  Tue, 12 Jul 2011 11:54:47 +0200
 
 
  -- Michael Vogt <mvo@debian.org>  Tue, 12 Jul 2011 11:54:47 +0200