From 384cfa1fe9dfd30b35d6f8b0ae87be643ab75d06 Mon Sep 17 00:00:00 2001 From: наб Date: Thu, 23 Jan 2025 20:37:35 +0100 Subject: Return string_view from Apt::String::Strip(). Take string_view in VectorizeString(), StringSplit(), SubstVar() --- apt-pkg/init.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'apt-pkg/init.cc') 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("") == tuple.npos && arch.find("") == 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); - auto myarch = SubstVar(arch, std::string(""), cpu); + auto mytuple = SubstVar(tuple, "", cpu); + auto myarch = SubstVar(arch, "", cpu); APT::ArchToTupleMap.insert({myarch, VectorizeString(mytuple, '-')}); } -- cgit v1.2.3-70-g09d2