HCoop
/
ntk
/
apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
apt-key del: Ignore case when checking if a keyid exists in a keyring.
[ntk/apt.git]
/
apt-pkg
/
indexfile.cc
diff --git
a/apt-pkg/indexfile.cc
b/apt-pkg/indexfile.cc
index
37be870
..
89615cb
100644
(file)
--- a/
apt-pkg/indexfile.cc
+++ b/
apt-pkg/indexfile.cc
@@
-8,10
+8,18
@@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
+#include<config.h>
+
#include <apt-pkg/indexfile.h>
#include <apt-pkg/error.h>
#include <apt-pkg/aptconfiguration.h>
#include <apt-pkg/indexfile.h>
#include <apt-pkg/error.h>
#include <apt-pkg/aptconfiguration.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/srcrecords.h>
+#include <apt-pkg/macros.h>
+#include <string>
+#include <vector>
#include <clocale>
#include <cstring>
/*}}}*/
#include <clocale>
#include <cstring>
/*}}}*/
@@
-27,7
+35,8
@@
unsigned long pkgIndexFile::Type::GlobalListLen = 0;
pkgIndexFile::Type::Type()
{
ItmList[GlobalListLen] = this;
pkgIndexFile::Type::Type()
{
ItmList[GlobalListLen] = this;
- GlobalListLen++;
+ GlobalListLen++;
+ Label = NULL;
}
/*}}}*/
// Type::GetType - Locate the type by name /*{{{*/
}
/*}}}*/
// Type::GetType - Locate the type by name /*{{{*/
@@
-44,9
+53,9
@@
pkgIndexFile::Type *pkgIndexFile::Type::GetType(const char *Type)
// IndexFile::ArchiveInfo - Stub /*{{{*/
// ---------------------------------------------------------------------
/* */
// IndexFile::ArchiveInfo - Stub /*{{{*/
// ---------------------------------------------------------------------
/* */
-st
ring pkgIndexFile::ArchiveInfo(pkgCache::VerIterator Ver
) const
+st
d::string pkgIndexFile::ArchiveInfo(pkgCache::VerIterator /*Ver*/
) const
{
{
- return string();
+ return st
d::st
ring();
}
/*}}}*/
// IndexFile::FindInCache - Stub /*{{{*/
}
/*}}}*/
// IndexFile::FindInCache - Stub /*{{{*/
@@
-60,10
+69,10
@@
pkgCache::PkgFileIterator pkgIndexFile::FindInCache(pkgCache &Cache) const
// IndexFile::SourceIndex - Stub /*{{{*/
// ---------------------------------------------------------------------
/* */
// IndexFile::SourceIndex - Stub /*{{{*/
// ---------------------------------------------------------------------
/* */
-st
ring pkgIndexFile::SourceInfo(pkgSrcRecords::Parser const &Record
,
- pkgSrcRecords::File const &
File
) const
+st
d::string pkgIndexFile::SourceInfo(pkgSrcRecords::Parser const &/*Record*/
,
+ pkgSrcRecords::File const &
/*File*/
) const
{
{
- return string();
+ return st
d::st
ring();
}
/*}}}*/
// IndexFile::TranslationsAvailable - Check if will use Translation /*{{{*/
}
/*}}}*/
// IndexFile::TranslationsAvailable - Check if will use Translation /*{{{*/
@@
-79,7
+88,7
@@
bool pkgIndexFile::TranslationsAvailable() {
is already done in getLanguages(). Note also that this check is
rather bad (doesn't take three character like ast into account).
TODO: Remove method with next API break */
is already done in getLanguages(). Note also that this check is
rather bad (doesn't take three character like ast into account).
TODO: Remove method with next API break */
-
__attribute__ ((deprecated))
bool pkgIndexFile::CheckLanguageCode(const char *Lang)
+
APT_DEPRECATED
bool pkgIndexFile::CheckLanguageCode(const char *Lang)
{
if (strlen(Lang) == 2 || (strlen(Lang) == 5 && Lang[2] == '_'))
return true;
{
if (strlen(Lang) == 2 || (strlen(Lang) == 5 && Lang[2] == '_'))
return true;
@@
-95,7
+104,7
@@
__attribute__ ((deprecated)) bool pkgIndexFile::CheckLanguageCode(const char *La
/* As we have now possibly more than one LanguageCode this method is
supersided by a) private classmembers or b) getLanguages().
TODO: Remove method with next API break */
/* As we have now possibly more than one LanguageCode this method is
supersided by a) private classmembers or b) getLanguages().
TODO: Remove method with next API break */
-
__attribute__ ((deprecated))
string pkgIndexFile::LanguageCode() {
+
APT_DEPRECATED std::
string pkgIndexFile::LanguageCode() {
if (TranslationsAvailable() == false)
return "";
return APT::Configuration::getLanguages()[0];
if (TranslationsAvailable() == false)
return "";
return APT::Configuration::getLanguages()[0];