From 982998a061461a503352d85b1d0a76a99c8480cd Mon Sep 17 00:00:00 2001 From: наб Date: Tue, 12 Nov 2024 17:59:21 +0100 Subject: apt-pkg/edsp/edsplistparser.cc: APT::StringView -> std::string_view --- apt-pkg/pkgcachegen.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'apt-pkg/pkgcachegen.cc') diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 981d360d2..1b629bd46 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -339,7 +339,7 @@ bool pkgCacheGenerator::MergeListPackage(ListParser &List, pkgCache::PkgIterator Pkg.Name(), "UsePackage", 1); // Find the right version to write the description - StringView CurMd5 = List.Description_md5(); + std::string_view CurMd5 = List.Description_md5(); std::vector availDesc = List.AvailableDescriptionLanguages(); for (Ver = Pkg.VersionList(); Ver.end() == false; ++Ver) { @@ -506,7 +506,7 @@ bool pkgCacheGenerator::MergeListVersion(ListParser &List, pkgCache::PkgIterator } /* Record the Description(s) based on their master md5sum */ - StringView CurMd5 = List.Description_md5(); + std::string_view CurMd5 = List.Description_md5(); /* Before we add a new description we first search in the group for a version with a description of the same MD5 - if so we reuse this -- cgit v1.2.3-70-g09d2 From e900ad1a727912b340aa43417bff895294854d3b Mon Sep 17 00:00:00 2001 From: наб Date: Tue, 12 Nov 2024 17:59:23 +0100 Subject: apt-pkg/pkgcachegen.cc, apt-pkg/pkgcachegen.h: APT::StringView -> std::string_view --- apt-pkg/deb/deblistparser.cc | 58 +++++++++---------- apt-pkg/deb/deblistparser.h | 16 +++--- apt-pkg/pkgcachegen.cc | 133 ++++++++++++++++++++++--------------------- apt-pkg/pkgcachegen.h | 39 +++++++------ 4 files changed, 123 insertions(+), 123 deletions(-) (limited to 'apt-pkg/pkgcachegen.cc') diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index f9835f797..fa36edf89 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -1,11 +1,11 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ /* ###################################################################### - + Package Cache Generator - Generator for the cache structure. - - This builds the cache structure from the abstract package list parser. - + + This builds the cache structure from the abstract package list parser. + ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ @@ -93,7 +93,7 @@ string debListParser::Package() { // ListParser::Architecture - Return the package arch /*{{{*/ // --------------------------------------------------------------------- /* This will return the Architecture of the package this section describes */ -APT::StringView debListParser::Architecture() { +std::string_view debListParser::Architecture() { auto const Arch = Section.Find(pkgTagSection::Key::Architecture); return Arch.empty() ? "none" : Arch; } @@ -108,9 +108,9 @@ bool debListParser::ArchitectureAll() { // ListParser::Version - Return the version string /*{{{*/ // --------------------------------------------------------------------- /* This is to return the string describing the version in debian form, - epoch:upstream-release. If this returns the blank string then the + epoch:upstream-release. If this returns the blank string then the entry is assumed to only describe package properties */ -APT::StringView debListParser::Version() +std::string_view debListParser::Version() { return Section.Find(pkgTagSection::Key::Version); } @@ -287,7 +287,7 @@ std::string_view debListParser::Description_md5() /*}}}*/ // ListParser::UsePackage - Update a package structure /*{{{*/ // --------------------------------------------------------------------- -/* This is called to update the package with any new information +/* This is called to update the package with any new information that might be found in the section */ bool debListParser::UsePackage(pkgCache::PkgIterator &Pkg, pkgCache::VerIterator &Ver) @@ -349,7 +349,7 @@ uint32_t debListParser::VersionHash() const char *End; if (Section.Find(I,Start,End) == false) continue; - + /* Strip out any spaces from the text, this undoes dpkgs reformatting of certain fields. dpkg also has the rather interesting notion of reformatting depends operators < -> <=, so we drop all = from the @@ -368,7 +368,7 @@ uint32_t debListParser::VersionHash() } - + return Result; } /*}}}*/ @@ -459,7 +459,7 @@ bool debStatusListParser::ParseStatus(pkgCache::PkgIterator &Pkg, /* A Status line marks the package as indicating the current version as well. Only if it is actually installed.. Otherwise - the interesting dpkg handling of the status file creates bogus + the interesting dpkg handling of the status file creates bogus entries. */ if (!(Pkg->CurrentState == pkgCache::State::NotInstalled || Pkg->CurrentState == pkgCache::State::ConfigFiles)) @@ -469,7 +469,7 @@ bool debStatusListParser::ParseStatus(pkgCache::PkgIterator &Pkg, else Pkg->CurrentVer = Ver.MapPointer(); } - + return true; } @@ -486,18 +486,18 @@ const char *debListParser::ConvertRelation(const char *I,unsigned int &Op) Op = pkgCache::Dep::LessEq; break; } - + if (*I == '<') { I++; Op = pkgCache::Dep::Less; break; } - + // < is the same as <= and << is really Cs < for some reason Op = pkgCache::Dep::LessEq; break; - + case '>': I++; if (*I == '=') @@ -506,18 +506,18 @@ const char *debListParser::ConvertRelation(const char *I,unsigned int &Op) Op = pkgCache::Dep::GreaterEq; break; } - + if (*I == '>') { I++; Op = pkgCache::Dep::Greater; break; } - + // > is the same as >= and >> is really Cs > for some reason Op = pkgCache::Dep::GreaterEq; break; - + case '=': Op = pkgCache::Dep::Equals; I++; @@ -573,20 +573,20 @@ const char *debListParser::ParseDepends(const char *Start, const char *Stop, Arch = _config->Find("APT::Architecture"); // Strip off leading space for (;Start != Stop && isspace_ascii(*Start) != 0; ++Start); - + // Parse off the package name const char *I = Start; for (;I != Stop && isspace_ascii(*I) == 0 && *I != '(' && *I != ')' && *I != ',' && *I != '|' && *I != '[' && *I != ']' && *I != '<' && *I != '>'; ++I); - + // Malformed, no '(' if (I != Stop && *I == ')') return 0; if (I == Start) return 0; - + // Stash the package name Package = StringView(Start, I - Start); @@ -602,7 +602,7 @@ const char *debListParser::ParseDepends(const char *Start, const char *Stop, // Skip white space to the '(' for (;I != Stop && isspace_ascii(*I) != 0 ; I++); - + // Parse a version if (I != Stop && *I == '(') { @@ -611,18 +611,18 @@ const char *debListParser::ParseDepends(const char *Start, const char *Stop, if (I + 3 > Stop) return 0; I = ConvertRelation(I,Op); - + // Skip whitespace for (;I != Stop && isspace_ascii(*I) != 0; I++); Start = I; I = (const char*) memchr(I, ')', Stop - I); if (I == NULL || Start == I) return 0; - + // Skip trailing whitespace const char *End = I; for (; End > Start && isspace_ascii(End[-1]); End--); - + Ver = StringView(Start,End-Start); I++; } @@ -631,7 +631,7 @@ const char *debListParser::ParseDepends(const char *Start, const char *Stop, Ver = StringView(); Op = pkgCache::Dep::NoOp; } - + // Skip whitespace for (;I != Stop && isspace_ascii(*I) != 0; I++); @@ -784,14 +784,14 @@ const char *debListParser::ParseDepends(const char *Start, const char *Stop, if (I != Stop && *I == '|') Op |= pkgCache::Dep::Or; - + if (I == Stop || *I == ',' || *I == '|') { if (I != Stop) for (I++; I != Stop && isspace_ascii(*I) != 0; I++); return I; } - + return 0; } /*}}}*/ @@ -1000,7 +1000,7 @@ unsigned char debListParser::GetPrio(string Str) unsigned char Out; if (GrabWord(Str,PrioList,Out) == false) Out = pkgCache::State::Extra; - + return Out; } /*}}}*/ diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h index 1070e806d..b791e6f38 100644 --- a/apt-pkg/deb/deblistparser.h +++ b/apt-pkg/deb/deblistparser.h @@ -1,10 +1,10 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ /* ###################################################################### - - Debian Package List Parser - This implements the abstract parser + + Debian Package List Parser - This implements the abstract parser interface for Debian package files - + ##################################################################### */ /*}}}*/ #ifndef PKGLIB_DEBLISTPARSER_H @@ -58,12 +58,12 @@ class APT_HIDDEN debListParser : public pkgCacheListParser public: APT_PUBLIC static unsigned char GetPrio(std::string Str); - + // These all operate against the current section virtual std::string Package() APT_OVERRIDE; virtual bool ArchitectureAll() APT_OVERRIDE; - virtual APT::StringView Architecture() APT_OVERRIDE; - virtual APT::StringView Version() APT_OVERRIDE; + virtual std::string_view Architecture() APT_OVERRIDE; + virtual std::string_view Version() APT_OVERRIDE; virtual bool NewVersion(pkgCache::VerIterator &Ver) APT_OVERRIDE; virtual std::vector AvailableDescriptionLanguages() APT_OVERRIDE; virtual std::string_view Description_md5() APT_OVERRIDE; @@ -117,8 +117,8 @@ class APT_HIDDEN debTranslationsParser : public debListParser { public: // a translation can never be a real package - virtual APT::StringView Architecture() APT_OVERRIDE { return ""; } - virtual APT::StringView Version() APT_OVERRIDE { return ""; } + virtual std::string_view Architecture() APT_OVERRIDE { return ""; } + virtual std::string_view Version() APT_OVERRIDE { return ""; } explicit debTranslationsParser(FileFd *File) : debListParser(File) {}; diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 1b629bd46..ab697fbce 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -1,11 +1,11 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ /* ###################################################################### - + Package Cache Generator - Generator for the cache structure. - - This builds the cache structure from the abstract package list parser. - + + This builds the cache structure from the abstract package list parser. + ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -45,10 +46,10 @@ typedef std::vector::iterator FileIterator; template std::vector pkgCacheGenerator::Dynamic::toReMap; static bool IsDuplicateDescription(pkgCache &Cache, pkgCache::DescIterator Desc, - APT::StringView CurMd5, std::string const &CurLang); + std::string_view CurMd5, std::string const &CurLang); using std::string; -using APT::StringView; +using std::string_view; // Convert an offset returned from e.g. DynamicMMap or ptr difference to // an uint32_t location without data loss. @@ -129,7 +130,7 @@ bool pkgCacheGenerator::Start() else { // Map directly from the existing file - Cache.ReMap(); + Cache.ReMap(); Map.UsePools(*Cache.HeaderP->Pools,sizeof(Cache.HeaderP->Pools)/sizeof(Cache.HeaderP->Pools[0])); if (Cache.VS != _system->VS) return _error->Error(_("Cache has an incompatible versioning system")); @@ -150,7 +151,7 @@ pkgCacheGenerator::~pkgCacheGenerator() return; if (Map.Sync() == false) return; - + Cache.HeaderP->Dirty = false; Cache.HeaderP->CacheFileSize = Cache.CacheHash(); @@ -192,7 +193,7 @@ void pkgCacheGenerator::ReMap(void const * const oldMap, void * const newMap, si APT_REMAP(pkgCache::RlsFileIterator); #undef APT_REMAP - for (APT::StringView* ViewP : Dynamic::toReMap) { + for (std::string_view* ViewP : Dynamic::toReMap) { if (std::get<1>(seen.insert(ViewP)) == false) continue; // Ignore views outside of the cache. @@ -200,7 +201,7 @@ void pkgCacheGenerator::ReMap(void const * const oldMap, void * const newMap, si || ViewP->data() > static_cast(oldMap) + oldSize) continue; const char *data = ViewP->data() + (static_cast(newMap) - static_cast(oldMap)); - *ViewP = StringView(data , ViewP->size()); + *ViewP = string_view(data , ViewP->size()); } } /*}}}*/ // CacheGenerator::WriteStringInMap /*{{{*/ @@ -255,10 +256,10 @@ bool pkgCacheGenerator::MergeList(ListParser &List, if (Counter % 100 == 0 && Progress != 0) Progress->Progress(List.Offset()); - APT::StringView Arch = List.Architecture(); - Dynamic DynArch(Arch); - APT::StringView Version = List.Version(); - Dynamic DynVersion(Version); + std::string_view Arch = List.Architecture(); + Dynamic DynArch(Arch); + std::string_view Version = List.Version(); + Dynamic DynVersion(Version); if (Version.empty() == true && Arch.empty() == true) { // package descriptions @@ -339,7 +340,7 @@ bool pkgCacheGenerator::MergeListPackage(ListParser &List, pkgCache::PkgIterator Pkg.Name(), "UsePackage", 1); // Find the right version to write the description - std::string_view CurMd5 = List.Description_md5(); + string_view CurMd5 = List.Description_md5(); std::vector availDesc = List.AvailableDescriptionLanguages(); for (Ver = Pkg.VersionList(); Ver.end() == false; ++Ver) { @@ -369,7 +370,7 @@ bool pkgCacheGenerator::MergeListPackage(ListParser &List, pkgCache::PkgIterator /*}}}*/ // CacheGenerator::MergeListVersion /*{{{*/ bool pkgCacheGenerator::MergeListVersion(ListParser &List, pkgCache::PkgIterator &Pkg, - APT::StringView const &Version, pkgCache::VerIterator* &OutVer) + std::string_view const &Version, pkgCache::VerIterator* &OutVer) { pkgCache::VerIterator Ver = Pkg.VersionList(); Dynamic DynVer(Ver); @@ -377,7 +378,7 @@ bool pkgCacheGenerator::MergeListVersion(ListParser &List, pkgCache::PkgIterator void const * oldMap = Map.Data(); auto Hash = List.VersionHash(); - APT::StringView ListSHA256; + std::string_view ListSHA256; bool const Debug = _config->FindB("Debug::pkgCacheGen", false); auto DebList = dynamic_cast(&List); @@ -405,10 +406,10 @@ bool pkgCacheGenerator::MergeListVersion(ListParser &List, pkgCache::PkgIterator if (ListSHA256.empty() || VersionExtra[Ver->ID].SHA256[0] == 0) break; // We have SHA256 for both, so they must match. - if (ListSHA256 == APT::StringView(VersionExtra[Ver->ID].SHA256, 64)) + if (ListSHA256 == std::string_view(VersionExtra[Ver->ID].SHA256, 64)) break; if (Debug) - std::cerr << "Found differing SHA256 for " << Pkg.Name() << "=" << Version.to_string() << std::endl; + std::cerr << "Found differing SHA256 for " << Pkg.Name() << "=" << Version << std::endl; } // sort (volatile) sources above not-sources like the status file @@ -506,7 +507,7 @@ bool pkgCacheGenerator::MergeListVersion(ListParser &List, pkgCache::PkgIterator } /* Record the Description(s) based on their master md5sum */ - std::string_view CurMd5 = List.Description_md5(); + string_view CurMd5 = List.Description_md5(); /* Before we add a new description we first search in the group for a version with a description of the same MD5 - if so we reuse this @@ -532,7 +533,7 @@ bool pkgCacheGenerator::MergeListVersion(ListParser &List, pkgCache::PkgIterator return true; } /*}}}*/ -bool pkgCacheGenerator::AddNewDescription(ListParser &List, pkgCache::VerIterator &Ver, std::string const &lang, APT::StringView CurMd5, map_stringitem_t &md5idx) /*{{{*/ +bool pkgCacheGenerator::AddNewDescription(ListParser &List, pkgCache::VerIterator &Ver, std::string const &lang, std::string_view CurMd5, map_stringitem_t &md5idx) /*{{{*/ { pkgCache::DescIterator Desc; Dynamic DynDesc(Desc); @@ -563,9 +564,9 @@ bool pkgCacheGenerator::AddNewDescription(ListParser &List, pkgCache::VerIterato // CacheGenerator::NewGroup - Add a new group /*{{{*/ // --------------------------------------------------------------------- /* This creates a new group structure and adds it to the hash table */ -bool pkgCacheGenerator::NewGroup(pkgCache::GrpIterator &Grp, StringView Name) +bool pkgCacheGenerator::NewGroup(pkgCache::GrpIterator &Grp, string_view Name) { - Dynamic DName(Name); + Dynamic DName(Name); Grp = Cache.FindGrp(Name); if (Grp.end() == false) return true; @@ -598,11 +599,11 @@ bool pkgCacheGenerator::NewGroup(pkgCache::GrpIterator &Grp, StringView Name) // CacheGenerator::NewPackage - Add a new package /*{{{*/ // --------------------------------------------------------------------- /* This creates a new package structure and adds it to the hash table */ -bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg, StringView Name, - StringView Arch) { +bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg, string_view Name, + string_view Arch) { pkgCache::GrpIterator Grp; - Dynamic DName(Name); - Dynamic DArch(Arch); + Dynamic DName(Name); + Dynamic DArch(Arch); Dynamic DynGrp(Grp); if (unlikely(NewGroup(Grp, Name) == false)) return false; @@ -714,24 +715,24 @@ bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg, StringView Name, if (Arch == "any") { size_t const found = Name.rfind(':'); - StringView ArchA = Name.substr(found + 1); + string_view ArchA = Name.substr(found + 1); if (ArchA != "any") { // ArchA is used inside the loop which might remap (NameA is not used) - Dynamic DynArchA(ArchA); - StringView NameA = Name.substr(0, found); + Dynamic DynArchA(ArchA); + string_view NameA = Name.substr(0, found); pkgCache::PkgIterator PkgA = Cache.FindPkg(NameA, ArchA); Dynamic DynPkgA(PkgA); if (PkgA.end()) { - Dynamic DynNameA(NameA); + Dynamic DynNameA(NameA); if (NewPackage(PkgA, NameA, ArchA) == false) return false; } if (unlikely(PkgA.end())) - return _error->Fatal("NewPackage was successful for %s:%s," + return _error->Fatal("NewPackage was successful for %.*s:%.*s," "but the package doesn't exist anyhow!", - NameA.to_string().c_str(), ArchA.to_string().c_str()); + (int)NameA.size(), NameA.data(), (int)ArchA.size(), ArchA.data()); else { pkgCache::PrvIterator Prv = PkgA.ProvidesList(); @@ -763,8 +764,8 @@ bool pkgCacheGenerator::AddImplicitDepends(pkgCache::GrpIterator &G, pkgCache::PkgIterator &P, pkgCache::VerIterator &V) { - APT::StringView Arch = P.Arch() == NULL ? "" : P.Arch(); - Dynamic DynArch(Arch); + std::string_view Arch = P.Arch() == NULL ? "" : P.Arch(); + Dynamic DynArch(Arch); map_pointer *OldDepLast = NULL; /* MultiArch handling introduces a lot of implicit Dependencies: - MultiArch: same → Co-Installable if they have the same version @@ -836,28 +837,28 @@ bool pkgCacheGenerator::NewFileVer(pkgCache::VerIterator &Ver, { if (CurrentFile == nullptr) return true; - + // Get a structure auto const VerFile = AllocateInMap(); if (VerFile == 0) return false; - + pkgCache::VerFileIterator VF(Cache,Cache.VerFileP + VerFile); VF->File = map_pointer{NarrowOffset(CurrentFile - Cache.PkgFileP)}; - + // Link it to the end of the list map_pointer *Last = &Ver->FileList; for (pkgCache::VerFileIterator V = Ver.FileList(); V.end() == false; ++V) Last = &V->NextFile; VF->NextFile = *Last; *Last = VF.MapPointer(); - + VF->Offset = List.Offset(); VF->Size = List.Size(); if (Cache.HeaderP->MaxVerFileSize < VF->Size) Cache.HeaderP->MaxVerFileSize = VF->Size; Cache.HeaderP->VerFileCount++; - + return true; } /*}}}*/ @@ -865,7 +866,7 @@ bool pkgCacheGenerator::NewFileVer(pkgCache::VerIterator &Ver, // --------------------------------------------------------------------- /* This puts a version structure in the linked list */ map_pointer pkgCacheGenerator::NewVersion(pkgCache::VerIterator &Ver, - APT::StringView const &VerStr, + std::string_view const &VerStr, map_pointer const ParentPkg, uint32_t Hash, map_pointer const Next) @@ -874,7 +875,7 @@ map_pointer pkgCacheGenerator::NewVersion(pkgCache::VerIterat auto const Version = AllocateInMap(); if (Version == 0) return 0; - + // Fill it in Ver = pkgCache::VerIterator(Cache,Cache.VerP + Version); auto d = AllocateInMap(); // sequence point so Ver can be moved if needed @@ -930,7 +931,7 @@ bool pkgCacheGenerator::NewFileDesc(pkgCache::DescIterator &Desc, { if (CurrentFile == nullptr) return true; - + // Get a structure auto const DescFile = AllocateInMap(); if (DescFile == 0) @@ -946,13 +947,13 @@ bool pkgCacheGenerator::NewFileDesc(pkgCache::DescIterator &Desc, DF->NextFile = *Last; *Last = DF.MapPointer(); - + DF->Offset = List.Offset(); DF->Size = List.Size(); if (Cache.HeaderP->MaxDescFileSize < DF->Size) Cache.HeaderP->MaxDescFileSize = DF->Size; Cache.HeaderP->DescFileCount++; - + return true; } /*}}}*/ @@ -961,7 +962,7 @@ bool pkgCacheGenerator::NewFileDesc(pkgCache::DescIterator &Desc, /* This puts a description structure in the linked list */ map_pointer pkgCacheGenerator::NewDescription(pkgCache::DescIterator &Desc, const string &Lang, - APT::StringView md5sum, + std::string_view md5sum, map_stringitem_t const idxmd5str) { // Get a structure @@ -1094,17 +1095,17 @@ bool pkgCacheGenerator::NewDepends(pkgCache::PkgIterator &Pkg, /* This creates a Group and the Package to link this dependency to if needed and handles also the caching of the old endpoint */ bool pkgCacheListParser::NewDepends(pkgCache::VerIterator &Ver, - StringView PackageName, - StringView Arch, - StringView Version, + string_view PackageName, + string_view Arch, + string_view Version, uint8_t const Op, uint8_t const Type) { pkgCache::GrpIterator Grp; Dynamic DynGrp(Grp); - Dynamic DynPackageName(PackageName); - Dynamic DynArch(Arch); - Dynamic DynVersion(Version); + Dynamic DynPackageName(PackageName); + Dynamic DynArch(Arch); + Dynamic DynVersion(Version); if (unlikely(Owner->NewGroup(Grp, PackageName) == false)) return false; @@ -1166,18 +1167,18 @@ bool pkgCacheListParser::NewDepends(pkgCache::VerIterator &Ver, /*}}}*/ // ListParser::NewProvides - Create a Provides element /*{{{*/ bool pkgCacheListParser::NewProvides(pkgCache::VerIterator &Ver, - StringView PkgName, - StringView PkgArch, - StringView Version, + string_view PkgName, + string_view PkgArch, + string_view Version, uint8_t const Flags) { pkgCache const &Cache = Owner->Cache; - Dynamic DynPkgName(PkgName); - Dynamic DynArch(PkgArch); - Dynamic DynVersion(Version); + Dynamic DynPkgName(PkgName); + Dynamic DynArch(PkgArch); + Dynamic DynVersion(Version); // We do not add self referencing provides - if (Ver.ParentPkg().Name() == PkgName && (PkgArch == Ver.ParentPkg().Arch() || + if (string_view{Ver.ParentPkg().Name()} == PkgName && (PkgArch == Ver.ParentPkg().Arch() || (PkgArch == "all" && strcmp((Cache.StrP + Cache.HeaderP->Architecture), Ver.ParentPkg().Arch()) == 0)) && (Version.empty() || Version == Ver.VerStr())) return true; @@ -1223,13 +1224,13 @@ bool pkgCacheGenerator::NewProvides(pkgCache::VerIterator &Ver, } /*}}}*/ // ListParser::NewProvidesAllArch - add provides for all architectures /*{{{*/ -bool pkgCacheListParser::NewProvidesAllArch(pkgCache::VerIterator &Ver, StringView Package, - StringView Version, uint8_t const Flags) { +bool pkgCacheListParser::NewProvidesAllArch(pkgCache::VerIterator &Ver, string_view Package, + string_view Version, uint8_t const Flags) { pkgCache &Cache = Owner->Cache; pkgCache::GrpIterator Grp = Cache.FindGrp(Package); Dynamic DynGrp(Grp); - Dynamic DynPackage(Package); - Dynamic DynVersion(Version); + Dynamic DynPackage(Package); + Dynamic DynVersion(Version); if (Grp.end() == true || Grp->FirstPackage == 0) return NewProvides(Ver, Package, Cache.NativeArch(), Version, Flags); @@ -1615,7 +1616,7 @@ static bool BuildCache(pkgCacheGenerator &Gen, /*}}}*/ // CacheGenerator::MakeStatusCache - Construct the status cache /*{{{*/ // --------------------------------------------------------------------- -/* This makes sure that the status cache (the cache that has all +/* This makes sure that the status cache (the cache that has all index files from the sources list and all local ones) is ready to be mmaped. If OutMap is not zero then a MMap object representing the cache will be stored there. This is pretty much mandatory if you @@ -1868,13 +1869,13 @@ bool pkgCacheGenerator::MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **O if (_error->PendingError() == true) return false; *OutMap = Map.release(); - + return true; } /*}}}*/ // IsDuplicateDescription /*{{{*/ static bool IsDuplicateDescription(pkgCache &Cache, pkgCache::DescIterator Desc, - APT::StringView CurMd5, std::string const &CurLang) + std::string_view CurMd5, std::string const &CurLang) { // Descriptions in the same link-list have all the same md5 if (Desc.end() == true || Cache.ViewString(Desc->md5sum) != CurMd5) diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index 5ac235255..3c0295220 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -27,7 +27,6 @@ #if __cplusplus >= 201103L #include #endif -#include #ifdef APT_COMPILING_APT #include @@ -41,7 +40,7 @@ class pkgCacheListParser; class APT_HIDDEN pkgCacheGenerator /*{{{*/ { - APT_HIDDEN map_stringitem_t WriteStringInMap(APT::StringView String) { return WriteStringInMap(String.data(), String.size()); }; + APT_HIDDEN map_stringitem_t WriteStringInMap(std::string_view String) { return WriteStringInMap(String.data(), String.size()); }; APT_HIDDEN map_stringitem_t WriteStringInMap(const char *String); APT_HIDDEN map_stringitem_t WriteStringInMap(const char *String, const unsigned long &Len); APT_HIDDEN uint32_t AllocateInMap(const unsigned long &size); @@ -115,12 +114,12 @@ class APT_HIDDEN pkgCacheGenerator /*{{{*/ std::string PkgFileName; pkgCache::PackageFile *CurrentFile; - bool NewGroup(pkgCache::GrpIterator &Grp, APT::StringView Name); - bool NewPackage(pkgCache::PkgIterator &Pkg, APT::StringView Name, APT::StringView Arch); - map_pointer NewVersion(pkgCache::VerIterator &Ver, APT::StringView const &VerStr, + bool NewGroup(pkgCache::GrpIterator &Grp, std::string_view Name); + bool NewPackage(pkgCache::PkgIterator &Pkg, std::string_view Name, std::string_view Arch); + map_pointer NewVersion(pkgCache::VerIterator &Ver, std::string_view const &VerStr, map_pointer const ParentPkg, uint32_t Hash, map_pointer const Next); - map_pointer NewDescription(pkgCache::DescIterator &Desc,const std::string &Lang, APT::StringView md5sum,map_stringitem_t const idxmd5str); + map_pointer NewDescription(pkgCache::DescIterator &Desc,const std::string &Lang, std::string_view md5sum,map_stringitem_t const idxmd5str); bool NewFileVer(pkgCache::VerIterator &Ver,ListParser &List); bool NewFileDesc(pkgCache::DescIterator &Desc,ListParser &List); bool NewDepends(pkgCache::PkgIterator &Pkg, pkgCache::VerIterator &Ver, @@ -134,7 +133,7 @@ class APT_HIDDEN pkgCacheGenerator /*{{{*/ enum StringType { MIXED, VERSIONNUMBER, SECTION }; map_stringitem_t StoreString(StringType const type, const char * S, unsigned int const Size); - inline map_stringitem_t StoreString(enum StringType const type, APT::StringView S) {return StoreString(type, S.data(),S.length());}; + inline map_stringitem_t StoreString(enum StringType const type, std::string_view S) {return StoreString(type, S.data(),S.length());}; void DropProgress() {Progress = 0;}; bool SelectFile(const std::string &File,pkgIndexFile const &Index, std::string const &Architecture, std::string const &Component, unsigned long Flags = 0); @@ -163,14 +162,14 @@ class APT_HIDDEN pkgCacheGenerator /*{{{*/ APT_HIDDEN bool MergeListGroup(ListParser &List, std::string const &GrpName); APT_HIDDEN bool MergeListPackage(ListParser &List, pkgCache::PkgIterator &Pkg); APT_HIDDEN bool MergeListVersion(ListParser &List, pkgCache::PkgIterator &Pkg, - APT::StringView const &Version, pkgCache::VerIterator* &OutVer); + std::string_view const &Version, pkgCache::VerIterator* &OutVer); APT_HIDDEN bool AddImplicitDepends(pkgCache::GrpIterator &G, pkgCache::PkgIterator &P, pkgCache::VerIterator &V); APT_HIDDEN bool AddImplicitDepends(pkgCache::VerIterator &V, pkgCache::PkgIterator &D); APT_HIDDEN bool AddNewDescription(ListParser &List, pkgCache::VerIterator &Ver, - std::string const &lang, APT::StringView CurMd5, map_stringitem_t &md5idx); + std::string const &lang, std::string_view CurMd5, map_stringitem_t &md5idx); }; /*}}}*/ // This is the abstract package list parser class. /*{{{*/ @@ -186,27 +185,27 @@ class APT_HIDDEN pkgCacheListParser void * const d; protected: - inline bool NewGroup(pkgCache::GrpIterator &Grp, APT::StringView Name) { return Owner->NewGroup(Grp, Name); } + inline bool NewGroup(pkgCache::GrpIterator &Grp, std::string_view Name) { return Owner->NewGroup(Grp, Name); } inline map_stringitem_t StoreString(pkgCacheGenerator::StringType const type, const char *S,unsigned int Size) {return Owner->StoreString(type, S, Size);}; - inline map_stringitem_t StoreString(pkgCacheGenerator::StringType const type, APT::StringView S) {return Owner->StoreString(type, S);}; - inline map_stringitem_t WriteString(APT::StringView S) {return Owner->WriteStringInMap(S.data(), S.size());}; + inline map_stringitem_t StoreString(pkgCacheGenerator::StringType const type, std::string_view S) {return Owner->StoreString(type, S);}; + inline map_stringitem_t WriteString(std::string_view S) {return Owner->WriteStringInMap(S.data(), S.size());}; inline map_stringitem_t WriteString(const char *S,unsigned int Size) {return Owner->WriteStringInMap(S,Size);}; - bool NewDepends(pkgCache::VerIterator &Ver,APT::StringView Package, APT::StringView Arch, - APT::StringView Version,uint8_t const Op, + bool NewDepends(pkgCache::VerIterator &Ver,std::string_view Package, std::string_view Arch, + std::string_view Version,uint8_t const Op, uint8_t const Type); - bool NewProvides(pkgCache::VerIterator &Ver,APT::StringView PkgName, - APT::StringView PkgArch, APT::StringView Version, + bool NewProvides(pkgCache::VerIterator &Ver,std::string_view PkgName, + std::string_view PkgArch, std::string_view Version, uint8_t const Flags); - bool NewProvidesAllArch(pkgCache::VerIterator &Ver, APT::StringView Package, - APT::StringView Version, uint8_t const Flags); + bool NewProvidesAllArch(pkgCache::VerIterator &Ver, std::string_view Package, + std::string_view Version, uint8_t const Flags); public: // These all operate against the current section virtual std::string Package() = 0; virtual bool ArchitectureAll() = 0; - virtual APT::StringView Architecture() = 0; - virtual APT::StringView Version() = 0; + virtual std::string_view Architecture() = 0; + virtual std::string_view Version() = 0; virtual bool NewVersion(pkgCache::VerIterator &Ver) = 0; virtual std::vector AvailableDescriptionLanguages() = 0; virtual std::string_view Description_md5() = 0; -- cgit v1.2.3-70-g09d2