HCoop
/
ntk
/
apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Chinese (simplified) program translation update
[ntk/apt.git]
/
apt-pkg
/
vendorlist.cc
diff --git
a/apt-pkg/vendorlist.cc
b/apt-pkg/vendorlist.cc
index
92ff388
..
fb33ff1
100644
(file)
--- a/
apt-pkg/vendorlist.cc
+++ b/
apt-pkg/vendorlist.cc
@@
-1,12
+1,31
@@
-#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 <stddef.h>
+#include <iostream>
+#include <string>
+#include <vector>
+
#include <apti18n.h>
#include <apti18n.h>
+#if __GNUC__ >= 4
+ #pragma GCC diagnostic push
+ #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;
}
@@
-44,7
+63,7
@@
bool pkgVendorList::Read(string File) /*{{{*/
bool pkgVendorList::CreateList(Configuration& Cnf) /*{{{*/
{
for (vector<const Vendor *>::const_iterator I = VendorList.begin();
bool pkgVendorList::CreateList(Configuration& Cnf) /*{{{*/
{
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
+73,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");
@@
-124,7
+143,7
@@
const Vendor* pkgVendorList::LookupFingerprint(string Fingerprint) /*{{{*/
/*}}}*/
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))
@@
-143,3
+162,7
@@
const Vendor* pkgVendorList::FindVendor(const std::vector<string> GPGVOutput) /*
return NULL;
}
/*}}}*/
return NULL;
}
/*}}}*/
+
+#if __GNUC__ >= 4
+ #pragma GCC diagnostic pop
+#endif