Apply patch from Sami Liedes <sliedes@cc.hut.fi> to avoid unecessary

temporary allocations.

diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index e1f9e3a1f3fc3269425ed899b290552dc4fd9269..0cbf14a7a4cc7cfa78671c6077a06b91213b0b83 100644 (file)
--- a/apt-pkg/contrib/strutl.h
+++ b/apt-pkg/contrib/strutl.h
@@ -66,6 +66,7 @@ bool CheckDomainList(const string &Host, const string &List);
 int tolower_ascii(int c);
 
 #define APT_MKSTRCMP(name,func) \
+inline int name(const char *A,const char *B) {return func(A,A+strlen(A),B,B+strlen(B));}; \
 inline int name(const char *A,const char *AEnd,const char *B) {return func(A,AEnd,B,B+strlen(B));}; \
 inline int name(string A,const char *B) {return func(A.c_str(),A.c_str()+A.length(),B,B+strlen(B));}; \
 inline int name(string A,string B) {return func(A.c_str(),A.c_str()+A.length(),B.c_str(),B.c_str()+B.length());}; \

diff --git a/debian/changelog b/debian/changelog
index 64271088fd0ac4f01a8e58252fa35da719979512..0404baf7bca56d00a43d56c8e2e670073c899cd8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -127,6 +127,8 @@ apt (0.7.22) UNRELEASED; urgency=low
   * Apply patch from Sami Liedes <sliedes@cc.hut.fi> to reduce the
     number of times we call progress bar updating and debugging
     configuration settings.
+  * Apply patch from Sami Liedes <sliedes@cc.hut.fi> to avoid unecessary
+    temporary allocations.
 
  -- Julian Andres Klode <jak@debian.org>  Fri, 03 Jul 2009 08:27:35 +0200