remove duplication in pkgCdrom::Add and ::Ident

[apt.git] / apt-pkg / vendorlist.cc

diff --git a/apt-pkg/vendorlist.cc b/apt-pkg/vendorlist.cc
index 8e5d09e8ae9c29a1b68250b1093cb355e2cd436a..6024256241eef05fc041e85c4a15a1e0359e79a8 100644 (file)
--- a/apt-pkg/vendorlist.cc
+++ b/apt-pkg/vendorlist.cc
@@ -1,16 +1,28 @@
-#include <apt-pkg/vendorlist.h>
+#include<config.h>
+

 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>

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

 #include <apti18n.h>
 
 #include <apti18n.h>
 

+#if __GNUC__ >= 4
+       #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
+#include <apt-pkg/vendor.h>
+#include <apt-pkg/vendorlist.h>
+
+using std::string;
+using std::vector;
+

 pkgVendorList::~pkgVendorList()
 {
    for (vector<const Vendor *>::const_iterator I = VendorList.begin(); 
 pkgVendorList::~pkgVendorList()
 {
    for (vector<const Vendor *>::const_iterator I = VendorList.begin(); 

-        I != VendorList.end(); I++)
+        I != VendorList.end(); ++I)

       delete *I;
 }
 
       delete *I;
 }
 

-// pkgVendorList::ReadMainList - Read list of known package vendors            /*{{{*/
+// pkgVendorList::ReadMainList - Read list of known package vendors    /*{{{*/

 // ---------------------------------------------------------------------
 /* This also scans a directory of vendor files similar to apt.conf.d 
    which can contain the usual suspects of distribution provided data.
 // ---------------------------------------------------------------------
 /* This also scans a directory of vendor files similar to apt.conf.d 
    which can contain the usual suspects of distribution provided data.


@@ -21,18 +33,18 @@ bool pkgVendorList::ReadMainList()
    Configuration Cnf;
 
    string CnfFile = _config->FindDir("Dir::Etc::vendorparts");
    Configuration Cnf;
 
    string CnfFile = _config->FindDir("Dir::Etc::vendorparts");

-   if (FileExists(CnfFile) == true)
+   if (DirectoryExists(CnfFile) == true)

       if (ReadConfigDir(Cnf,CnfFile,true) == false)
         return false;
    CnfFile = _config->FindFile("Dir::Etc::vendorlist");
       if (ReadConfigDir(Cnf,CnfFile,true) == false)
         return false;
    CnfFile = _config->FindFile("Dir::Etc::vendorlist");

-   if (FileExists(CnfFile) == true)
+   if (RealFileExists(CnfFile) == true)

       if (ReadConfigFile(Cnf,CnfFile,true) == false)
         return false;
 
    return CreateList(Cnf);
 }
       if (ReadConfigFile(Cnf,CnfFile,true) == false)
         return false;
 
    return CreateList(Cnf);
 }

-
-bool pkgVendorList::Read(string File)
+                                                                       /*}}}*/
+bool pkgVendorList::Read(string File)                                  /*{{{*/

 {
    Configuration Cnf;
    if (ReadConfigFile(Cnf,File,true) == false)
 {
    Configuration Cnf;
    if (ReadConfigFile(Cnf,File,true) == false)


@@ -40,11 +52,11 @@ bool pkgVendorList::Read(string File)
 
    return CreateList(Cnf);
 }
 
    return CreateList(Cnf);
 }

-
-bool pkgVendorList::CreateList(Configuration& Cnf)
+                                                                       /*}}}*/
+bool pkgVendorList::CreateList(Configuration& Cnf)                     /*{{{*/

 {
    for (vector<const Vendor *>::const_iterator I = VendorList.begin(); 
 {
    for (vector<const Vendor *>::const_iterator I = VendorList.begin(); 

-       I != VendorList.end(); I++)
+       I != VendorList.end(); ++I)

       delete *I;
    VendorList.erase(VendorList.begin(),VendorList.end());
 
       delete *I;
    VendorList.erase(VendorList.begin(),VendorList.end());
 


@@ -54,7 +66,7 @@ bool pkgVendorList::CreateList(Configuration& Cnf)
       Configuration Block(Top);
       string VendorID = Top->Tag;
       vector <struct Vendor::Fingerprint *> *Fingerprints = new vector<Vendor::Fingerprint *>;
       Configuration Block(Top);
       string VendorID = Top->Tag;
       vector <struct Vendor::Fingerprint *> *Fingerprints = new vector<Vendor::Fingerprint *>;

-      struct Vendor::Fingerprint *Fingerprint = new struct Vendor::Fingerprint;
+      struct Vendor::Fingerprint *Fingerprint = new struct Vendor::Fingerprint();

       string Origin = Block.Find("Origin");
 
       Fingerprint->Print = Block.Find("Fingerprint");
       string Origin = Block.Find("Origin");
 
       Fingerprint->Print = Block.Find("Fingerprint");


@@ -110,8 +122,8 @@ bool pkgVendorList::CreateList(Configuration& Cnf)
    
    return !_error->PendingError();
 }
    
    return !_error->PendingError();
 }

-
-const Vendor* pkgVendorList::LookupFingerprint(string Fingerprint)
+                                                                       /*}}}*/
+const Vendor* pkgVendorList::LookupFingerprint(string Fingerprint)     /*{{{*/

 {
    for (const_iterator I = VendorList.begin(); I != VendorList.end(); ++I)
    {
 {
    for (const_iterator I = VendorList.begin(); I != VendorList.end(); ++I)
    {


@@ -121,10 +133,10 @@ const Vendor* pkgVendorList::LookupFingerprint(string Fingerprint)
 
    return NULL;
 }
 
    return NULL;
 }

-
-const Vendor* pkgVendorList::FindVendor(const std::vector<string> GPGVOutput)
+                                                                       /*}}}*/
+const Vendor* pkgVendorList::FindVendor(const std::vector<string> GPGVOutput)  /*{{{*/

 {
 {

-   for (std::vector<string>::const_iterator I = GPGVOutput.begin(); I != GPGVOutput.end(); I++)
+   for (std::vector<string>::const_iterator I = GPGVOutput.begin(); I != GPGVOutput.end(); ++I)

    {
       string::size_type pos = (*I).find("VALIDSIG ");
       if (_config->FindB("Debug::Vendor", false))
    {
       string::size_type pos = (*I).find("VALIDSIG ");
       if (_config->FindB("Debug::Vendor", false))


@@ -142,3 +154,8 @@ const Vendor* pkgVendorList::FindVendor(const std::vector<string> GPGVOutput)
 
    return NULL;
 }
 
    return NULL;
 }

+                                                                       /*}}}*/
+
+#if __GNUC__ >= 4
+       #pragma GCC diagnostic warning "-Wdeprecated-declarations"
+#endif