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

---
 ftparchive/contents.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'ftparchive/contents.cc')

diff --git a/ftparchive/contents.cc b/ftparchive/contents.cc
index eadced626..adb590ed1 100644
--- a/ftparchive/contents.cc
+++ b/ftparchive/contents.cc
@@ -33,9 +33,8 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include "contents.h"
+#include <config.h>
 
-#include <apti18n.h>
 #include <apt-pkg/debfile.h>
 #include <apt-pkg/extracttar.h>
 #include <apt-pkg/error.h>
@@ -43,6 +42,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <malloc.h>
+
+#include <apti18n.h>
+#include "contents.h"
 									/*}}}*/
 
 // GenContents::~GenContents - Free allocated memory			/*{{{*/
-- 
cgit v1.2.3


From 650faab01603caac04494d54cf6b10a65c00ea13 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Tue, 13 Sep 2011 17:46:48 +0200
Subject: Support large files in the complete toolset. Indexes of this size are
 pretty unlikely for now, but we need it for deb packages which could become
 bigger than 4GB now (LP: #815895)

---
 ftparchive/contents.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ftparchive/contents.cc')

diff --git a/ftparchive/contents.cc b/ftparchive/contents.cc
index adb590ed1..65d8dd1ce 100644
--- a/ftparchive/contents.cc
+++ b/ftparchive/contents.cc
@@ -349,7 +349,7 @@ bool ContentsExtract::DoItem(Item &Itm,int &Fd)
 // ContentsExtract::TakeContents - Load the contents data		/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool ContentsExtract::TakeContents(const void *NewData,unsigned long Length)
+bool ContentsExtract::TakeContents(const void *NewData,unsigned long long Length)
 {
    if (Length == 0)
    {
-- 
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)

---
 ftparchive/contents.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ftparchive/contents.cc')

diff --git a/ftparchive/contents.cc b/ftparchive/contents.cc
index 65d8dd1ce..bbc5a1e2b 100644
--- a/ftparchive/contents.cc
+++ b/ftparchive/contents.cc
@@ -380,7 +380,7 @@ bool ContentsExtract::TakeContents(const void *NewData,unsigned long long Length
 // ContentsExtract::Add - Read the contents data into the sorter	/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-void ContentsExtract::Add(GenContents &Contents,string const &Package)
+void ContentsExtract::Add(GenContents &Contents,std::string const &Package)
 {
    const char *Start = Data;
    char *Pkg = Contents.Mystrdup(Package.c_str());
-- 
cgit v1.2.3