fix "Mismatched free() / delete / delete []" in simple_buffer

[apt.git] / apt-pkg / contrib / configuration.h

diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h
index 6345c8a5d5efdf107476500e79fcfee05599905f..97a01e4cfa25f41cece02043b2507c79c5615058 100644 (file)
--- a/apt-pkg/contrib/configuration.h
+++ b/apt-pkg/contrib/configuration.h
@@ -34,6 +34,8 @@
 #include <vector>
 #include <iostream>
 
 #include <vector>
 #include <iostream>
 

+#include <apt-pkg/macros.h>
+

 #ifndef APT_8_CLEANER_HEADERS
 using std::string;
 #endif
 #ifndef APT_8_CLEANER_HEADERS
 using std::string;
 #endif


@@ -59,7 +61,7 @@ class Configuration
    
    Item *Root;
    bool ToFree;
    
    Item *Root;
    bool ToFree;

-   
+

    Item *Lookup(Item *Head,const char *S,unsigned long const &Len,bool const &Create);
    Item *Lookup(const char *Name,const bool &Create);
    inline const Item *Lookup(const char *Name) const
    Item *Lookup(Item *Head,const char *S,unsigned long const &Len,bool const &Create);
    Item *Lookup(const char *Name,const bool &Create);
    inline const Item *Lookup(const char *Name) const


@@ -82,12 +84,9 @@ class Configuration
     *
     * \param Name of the parent node
     * \param Default list of values separated by commas */
     *
     * \param Name of the parent node
     * \param Default list of values separated by commas */

-   std::vector<std::string> FindVector(const char *Name, std::string const &Default) const;
-   std::vector<std::string> FindVector(std::string const &Name, std::string const &Default) const { return FindVector(Name.c_str(), Default); };
-#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR < 13)
-   std::vector<std::string> FindVector(const char *Name) const;
-#endif
-   std::vector<std::string> FindVector(std::string const &Name="") const { return FindVector(Name.c_str(), ""); };
+   std::vector<std::string> FindVector(const char *Name, std::string const &Default = "", bool const Keys = false) const;
+   std::vector<std::string> FindVector(std::string const &Name, std::string const &Default = "", bool const Keys = false) const { return FindVector(Name.c_str(), Default, Keys); };
+

    int FindI(const char *Name,int const &Default = 0) const;
    int FindI(std::string const &Name,int const &Default = 0) const {return FindI(Name.c_str(),Default);};
    bool FindB(const char *Name,bool const &Default = false) const;
    int FindI(const char *Name,int const &Default = 0) const;
    int FindI(std::string const &Name,int const &Default = 0) const {return FindI(Name.c_str(),Default);};
    bool FindB(const char *Name,bool const &Default = false) const;


@@ -104,6 +103,8 @@ class Configuration
    bool Exists(const char *Name) const;
    bool ExistsAny(const char *Name) const;
 
    bool Exists(const char *Name) const;
    bool ExistsAny(const char *Name) const;
 

+   void MoveSubTree(char const * const OldRoot, char const * const NewRoot);
+

    // clear a whole tree
    void Clear(const std::string &Name);
    void Clear();
    // clear a whole tree
    void Clear(const std::string &Name);
    void Clear();


@@ -127,7 +128,7 @@ class Configuration
    class MatchAgainstConfig
    {
      std::vector<regex_t *> patterns;
    class MatchAgainstConfig
    {
      std::vector<regex_t *> patterns;

-     void clearPatterns();
+     APT_HIDDEN void clearPatterns();

 
    public:
      MatchAgainstConfig(char const * Config);
 
    public:
      MatchAgainstConfig(char const * Config);