summaryrefslogtreecommitdiff
path: root/apt-private
diff options
context:
space:
mode:
Diffstat (limited to 'apt-private')
-rw-r--r--apt-private/private-install.cc8
-rw-r--r--apt-private/private-install.h4
-rw-r--r--apt-private/private-source.cc12
-rw-r--r--apt-private/private-upgrade.cc2
4 files changed, 13 insertions, 13 deletions
diff --git a/apt-private/private-install.cc b/apt-private/private-install.cc
index 63e7b734d..aa28780da 100644
--- a/apt-private/private-install.cc
+++ b/apt-private/private-install.cc
@@ -540,15 +540,15 @@ static const unsigned short MOD_INSTALL = 2;
bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, CacheFile &Cache, int UpgradeMode)
{
- std::vector<const char*> VolatileCmdL;
+ std::vector<std::string> VolatileCmdL;
return DoCacheManipulationFromCommandLine(CmdL, VolatileCmdL, Cache, UpgradeMode);
}
-bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, std::vector<const char*> &VolatileCmdL, CacheFile &Cache, int UpgradeMode)
+bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, std::vector<std::string> &VolatileCmdL, CacheFile &Cache, int UpgradeMode)
{
std::map<unsigned short, APT::VersionSet> verset;
return DoCacheManipulationFromCommandLine(CmdL, VolatileCmdL, Cache, verset, UpgradeMode);
}
-bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, std::vector<const char*> &VolatileCmdL, CacheFile &Cache,
+bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, std::vector<std::string> &VolatileCmdL, CacheFile &Cache,
std::map<unsigned short, APT::VersionSet> &verset, int UpgradeMode)
{
// Enter the special broken fixing mode if the user specified arguments
@@ -694,7 +694,7 @@ struct PkgIsExtraInstalled {
bool DoInstall(CommandLine &CmdL)
{
CacheFile Cache;
- std::vector<char const *> VolatileCmdL;
+ std::vector<std::string> VolatileCmdL;
Cache.GetSourceList()->AddVolatileFiles(CmdL, &VolatileCmdL);
// then open the cache
diff --git a/apt-private/private-install.h b/apt-private/private-install.h
index 6bb863f61..d2a9bed3f 100644
--- a/apt-private/private-install.h
+++ b/apt-private/private-install.h
@@ -18,9 +18,9 @@ class pkgProblemResolver;
APT_PUBLIC bool DoInstall(CommandLine &Cmd);
-bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, std::vector<const char*> &VolatileCmdL, CacheFile &Cache,
+bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, std::vector<std::string> &VolatileCmdL, CacheFile &Cache,
std::map<unsigned short, APT::VersionSet> &verset, int UpgradeMode);
-bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, std::vector<const char*> &VolatileCmdL, CacheFile &Cache, int UpgradeMode);
+bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, std::vector<std::string> &VolatileCmdL, CacheFile &Cache, int UpgradeMode);
bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, CacheFile &Cache, int UpgradeMode);
APT_PUBLIC bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
diff --git a/apt-private/private-source.cc b/apt-private/private-source.cc
index 220f1bd5a..fab1b4532 100644
--- a/apt-private/private-source.cc
+++ b/apt-private/private-source.cc
@@ -644,7 +644,7 @@ static void WriteBuildDependencyPackage(std::ostringstream &buildDepsPkgFile,
bool DoBuildDep(CommandLine &CmdL)
{
CacheFile Cache;
- std::vector<char const *> VolatileCmdL;
+ std::vector<std::string> VolatileCmdL;
Cache.GetSourceList()->AddVolatileFiles(CmdL, &VolatileCmdL);
_config->Set("APT::Install-Recommends", false);
@@ -702,18 +702,18 @@ bool DoBuildDep(CommandLine &CmdL)
{
for (size_t i = 0; i < VolatileSources.size(); ++i)
{
- char const * const Src = VolatileCmdL[i];
+ auto const Src = VolatileCmdL[i];
if (DirectoryExists(Src))
- ioprintf(c1out, _("Note, using directory '%s' to get the build dependencies\n"), Src);
+ ioprintf(c1out, _("Note, using directory '%s' to get the build dependencies\n"), Src.c_str());
else
- ioprintf(c1out, _("Note, using file '%s' to get the build dependencies\n"), Src);
+ ioprintf(c1out, _("Note, using file '%s' to get the build dependencies\n"), Src.c_str());
std::unique_ptr<pkgSrcRecords::Parser> Last(VolatileSources[i]->CreateSrcParser());
if (Last == nullptr)
- return _error->Error(_("Unable to find a source package for %s"), Src);
+ return _error->Error(_("Unable to find a source package for %s"), Src.c_str());
std::string const pseudo = std::string("builddeps:") + Src;
WriteBuildDependencyPackage(buildDepsPkgFile, pseudo, pseudoArch,
- GetBuildDeps(Last.get(), Src, StripMultiArch, hostArch));
+ GetBuildDeps(Last.get(), Src.c_str(), StripMultiArch, hostArch));
pseudoPkgs.emplace_back(pseudo, pseudoArch);
}
}
diff --git a/apt-private/private-upgrade.cc b/apt-private/private-upgrade.cc
index 4e0197a3f..679140bfd 100644
--- a/apt-private/private-upgrade.cc
+++ b/apt-private/private-upgrade.cc
@@ -19,7 +19,7 @@
static bool UpgradeHelper(CommandLine &CmdL, int UpgradeFlags)
{
CacheFile Cache;
- std::vector<char const *> VolatileCmdL;
+ std::vector<std::string> VolatileCmdL;
Cache.GetSourceList()->AddVolatileFiles(CmdL, &VolatileCmdL);
if (Cache.OpenForInstall() == false || Cache.CheckDeps() == false)