Merge EDSP 0.5 w/ multi-arch support for external solvers

[apt.git] / ftparchive / contents.cc

diff --git a/ftparchive/contents.cc b/ftparchive/contents.cc
index be4d2a61e1cf97f12e2065e9ba3118937d77ffa2..91dd2b8bde68de0ed8d8859aee8debdabe810f5f 100644 (file)
--- a/ftparchive/contents.cc
+++ b/ftparchive/contents.cc
@@ -36,13 +36,12 @@
 #include <config.h>
 
 #include <apt-pkg/debfile.h>
 #include <config.h>
 
 #include <apt-pkg/debfile.h>

-#include <apt-pkg/extracttar.h>
+#include <apt-pkg/dirstream.h>

 #include <apt-pkg/error.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <apt-pkg/error.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

-#include <malloc.h>

 
 #include "contents.h"
 
 
 #include "contents.h"
 


@@ -303,7 +302,18 @@ void GenContents::DoPrint(FILE *Out,GenContents::Node *Top, char *Buf)
    DoPrint(Out,Top->BTreeRight,Buf);  
 }
                                                                        /*}}}*/
    DoPrint(Out,Top->BTreeRight,Buf);  
 }
                                                                        /*}}}*/

-
+// ContentsExtract Constructor                                         /*{{{*/
+ContentsExtract::ContentsExtract()
+   : Data(0), MaxSize(0), CurSize(0) 
+{
+};
+                                                                       /*}}}*/
+// ContentsExtract Destructor                                          /*{{{*/
+ContentsExtract::~ContentsExtract()
+{
+   free(Data);
+};
+                                                                       /*}}}*/

 // ContentsExtract::Read - Read the archive                            /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // ContentsExtract::Read - Read the archive                            /*{{{*/
 // ---------------------------------------------------------------------
 /* */