summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/contrib/strutl.cc6
-rw-r--r--apt-pkg/contrib/strutl.h2
-rw-r--r--debian/changelog5
3 files changed, 7 insertions, 6 deletions
diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index e998d74dc..ab2da2d9a 100644
--- 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;
}
/*}}}*/
-// 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;
diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index 2a6bc1990..fba85cf94 100644
--- 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 DeEscapeString(string &input);
+string DeEscapeString(const string &input);
string SizeToStr(double Bytes);
string TimeToStr(unsigned long Sec);
diff --git a/debian/changelog b/debian/changelog
index f620bd871..0f8035a78 100644
--- 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:
- - 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