diff options
| author | наб <nabijaczleweli@nabijaczleweli.xyz> | 2025-01-23 20:37:35 +0100 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2025-02-14 19:45:12 +0100 |
| commit | 384cfa1fe9dfd30b35d6f8b0ae87be643ab75d06 (patch) | |
| tree | cbda3ac7c585141a4900d41a7162be78f9a61150 /apt-pkg/init.cc | |
| parent | 7f4c339d6fe19ff7e26144e373a6e5c73344539f (diff) | |
Return string_view from Apt::String::Strip(). Take string_view in VectorizeString(), StringSplit(), SubstVar()
Diffstat (limited to 'apt-pkg/init.cc')
| -rw-r--r-- | apt-pkg/init.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index d56973eeb..61d45e37e 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -70,7 +70,7 @@ static bool pkgInitArchTupleMap() auto cpurow = split(cpuline); auto cpu = APT::String::Strip(cpurow.at(0)); - cpus.push_back(cpu); + cpus.emplace_back(cpu); } if (!cputable.eof()) return _error->Error("Error reading the CPU table"); @@ -97,14 +97,14 @@ static bool pkgInitArchTupleMap() if (tuple.find("<cpu>") == tuple.npos && arch.find("<cpu>") == arch.npos) { - APT::ArchToTupleMap.insert({arch, VectorizeString(tuple, '-')}); + APT::ArchToTupleMap.insert({std::string{arch}, VectorizeString(tuple, '-')}); } else { for (auto && cpu : cpus) { - auto mytuple = SubstVar(tuple, std::string("<cpu>"), cpu); - auto myarch = SubstVar(arch, std::string("<cpu>"), cpu); + auto mytuple = SubstVar(tuple, "<cpu>", cpu); + auto myarch = SubstVar(arch, "<cpu>", cpu); APT::ArchToTupleMap.insert({myarch, VectorizeString(mytuple, '-')}); } |