summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2009-07-25 16:29:49 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2009-07-25 16:29:49 -0300
commit76fcbe5c97849dcbbe67434d08e0a22c02fedd51 (patch)
tree69d2ff02b5e86ce7b4cc06ecb57a02dbe466b1c1
parent95afdfd096e0275c78a6ee7b1148f84af530650e (diff)
Apply patch from Sami Liedes <sliedes@cc.hut.fi> to avoid unecessary
temporary allocations.
-rw-r--r--apt-pkg/contrib/strutl.h1
-rw-r--r--debian/changelog2
2 files changed, 3 insertions, 0 deletions
diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index e1f9e3a1f..0cbf14a7a 100644
--- 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 64271088f..0404baf7b 100644
--- 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