Merge remote-tracking branch 'donkult/debian/experimental' into debian/experimental

[apt.git] / ftparchive / contents.h

diff --git a/ftparchive/contents.h b/ftparchive/contents.h
index 4af9db574b79168f41d5e6a3f097443855287bd4..953d0d54b9c70dc410d570dd716b8f0e8c7f801f 100644 (file)
--- a/ftparchive/contents.h
+++ b/ftparchive/contents.h
@@ -9,12 +9,15 @@
                                                                        /*}}}*/
 #ifndef CONTENTS_H
 #define CONTENTS_H
                                                                        /*}}}*/
 #ifndef CONTENTS_H
 #define CONTENTS_H

-    
-#include <stdlib.h>
-#include <stdio.h>
+

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

+#include <stddef.h>
+#include <stdio.h>
+#include <string>
+

 class debDebFile;
 class debDebFile;

+class FileFd;

 
 class GenContents
 {
 
 class GenContents
 {


@@ -52,14 +55,14 @@ class GenContents
    unsigned long NodeLeft;
    
    Node *Grab(Node *Top,const char *Name,const char *Package);
    unsigned long NodeLeft;
    
    Node *Grab(Node *Top,const char *Name,const char *Package);

-   void WriteSpace(FILE *Out,unsigned int Current,unsigned int Target);
-   void DoPrint(FILE *Out,Node *Top, char *Buf);
+   void WriteSpace(std::string &out, size_t Current, size_t Target);
+   void DoPrint(FileFd &Out,Node *Top, char *Buf);

    
    public:
    
    char *Mystrdup(const char *From);
    void Add(const char *Dir,const char *Package);   
    
    public:
    
    char *Mystrdup(const char *From);
    void Add(const char *Dir,const char *Package);   

-   void Print(FILE *Out);
+   void Print(FileFd &Out);

 
    GenContents() : BlockList(0), StrPool(0), StrLeft(0), 
                    NodePool(0), NodeLeft(0) {};
 
    GenContents() : BlockList(0), StrPool(0), StrLeft(0), 
                    NodePool(0), NodeLeft(0) {};


@@ -83,8 +86,8 @@ class ContentsExtract : public pkgDirStream
    bool TakeContents(const void *Data,unsigned long long Length);
    void Add(GenContents &Contents,std::string const &Package);
    
    bool TakeContents(const void *Data,unsigned long long Length);
    void Add(GenContents &Contents,std::string const &Package);
    

-   ContentsExtract() : Data(0), MaxSize(0), CurSize(0) {};
-   virtual ~ContentsExtract() {delete [] Data;};
+   ContentsExtract();
+   virtual ~ContentsExtract();

 };
 
 #endif
 };
 
 #endif