From f7f0d6c7560a8f71707e7852a512469147aa9f84 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Thu, 11 Aug 2011 20:53:28 +0200
Subject: cppcheck complains about some possible speed improvements which could
 be done on the mirco-optimazation level, so lets fix them:  (performance)
 Possible inefficient checking for emptiness.  (performance) Prefer prefix
 ++/-- operators for non-primitive types.

---
 apt-pkg/deb/debrecords.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'apt-pkg/deb/debrecords.cc')

diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc
index ec9e395ef..7f596ab0d 100644
--- a/apt-pkg/deb/debrecords.cc
+++ b/apt-pkg/deb/debrecords.cc
@@ -118,7 +118,7 @@ string debRecordParser::LongDesc()
   {
      vector<string> const lang = APT::Configuration::getLanguages();
      for (vector<string>::const_iterator l = lang.begin();
-	  orig.empty() && l != lang.end(); l++)
+	  orig.empty() && l != lang.end(); ++l)
 	orig = Section.FindS(string("Description-").append(*l).c_str());
   }
 
-- 
cgit v1.2.3


From ea54214002c09eeb4dd498d97a564471ec9993c5 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Tue, 13 Sep 2011 10:09:00 +0200
Subject: reorder includes: add <config.h> if needed and include it at first

---
 apt-pkg/deb/debrecords.cc | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'apt-pkg/deb/debrecords.cc')

diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc
index 1ca9ae1d2..db62d6c45 100644
--- a/apt-pkg/deb/debrecords.cc
+++ b/apt-pkg/deb/debrecords.cc
@@ -8,6 +8,8 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/debrecords.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>
-- 
cgit v1.2.3


From 8f3ba4e8708cb72be19dacc2af4f601ee5fea292 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Mon, 19 Sep 2011 13:31:29 +0200
Subject: do not pollute namespace in the headers with using (Closes: #500198)

---
 apt-pkg/deb/debrecords.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'apt-pkg/deb/debrecords.cc')

diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc
index 4dfc8b56a..ef6a7ca9d 100644
--- a/apt-pkg/deb/debrecords.cc
+++ b/apt-pkg/deb/debrecords.cc
@@ -17,6 +17,8 @@
 #include <langinfo.h>
 									/*}}}*/
 
+using std::string;
+
 // RecordParser::debRecordParser - Constructor				/*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -135,8 +137,8 @@ string debRecordParser::LongDesc()
      orig = Section.FindS("Description").c_str();
   else
   {
-     vector<string> const lang = APT::Configuration::getLanguages();
-     for (vector<string>::const_iterator l = lang.begin();
+     std::vector<string> const lang = APT::Configuration::getLanguages();
+     for (std::vector<string>::const_iterator l = lang.begin();
 	  orig.empty() && l != lang.end(); ++l)
 	orig = Section.FindS(string("Description-").append(*l).c_str());
   }
-- 
cgit v1.2.3


From 472ff00ef2e48383805d281c6364ec27839e3f4d Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Mon, 19 Sep 2011 19:14:19 +0200
Subject: use forward declaration in headers if possible instead of includes

---
 apt-pkg/deb/debrecords.cc | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'apt-pkg/deb/debrecords.cc')

diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc
index ef6a7ca9d..1afa7b74d 100644
--- a/apt-pkg/deb/debrecords.cc
+++ b/apt-pkg/deb/debrecords.cc
@@ -14,6 +14,8 @@
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/aptconfiguration.h>
+#include <apt-pkg/fileutl.h>
+
 #include <langinfo.h>
 									/*}}}*/
 
-- 
cgit v1.2.3