diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2017-12-13 23:54:38 +0100 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2017-12-13 23:54:38 +0100 |
| commit | 99813a2eaa7c0cce1d7d8c811827733ed66458de (patch) | |
| tree | 61fe422eeca8c5bd5cb2de6060f11e71343d4602 /cmdline | |
| parent | d30b30ad1e1ce434df84e15e2573c43ac152f9e3 (diff) | |
| parent | 0b5e329a8ba2461ccb7017d3adfc972f9dccd830 (diff) | |
Merge branch 'feature/happy-gcc'
Fixing various real and imagined bugs reported by gcc warnings
Diffstat (limited to 'cmdline')
| -rw-r--r-- | cmdline/apt-config.cc | 2 | ||||
| -rw-r--r-- | cmdline/apt-helper.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc index ef1e95de1..4e546b098 100644 --- a/cmdline/apt-config.cc +++ b/cmdline/apt-config.cc @@ -128,7 +128,7 @@ int main(int argc,const char *argv[]) /*{{{*/ _config->Set(comp + "Name", c->Name); _config->Set(comp + "Extension", c->Extension); _config->Set(comp + "Binary", c->Binary); - _config->Set(std::string(comp + "Cost").c_str(), c->Cost); + _config->Set((comp + "Cost").c_str(), c->Cost); for (std::vector<std::string>::const_iterator a = c->CompressArgs.begin(); a != c->CompressArgs.end(); ++a) _config->Set(comp + "CompressArg::", *a); for (std::vector<std::string>::const_iterator a = c->UncompressArgs.begin(); a != c->UncompressArgs.end(); ++a) diff --git a/cmdline/apt-helper.cc b/cmdline/apt-helper.cc index af8421f41..d1a3b4e6e 100644 --- a/cmdline/apt-helper.cc +++ b/cmdline/apt-helper.cc @@ -197,7 +197,7 @@ static bool ServiceIsActive(const char *service) return ExecWait(pid, "systemctl is-active", true); } -static bool DoWaitOnline(CommandLine &CmdL) +static bool DoWaitOnline(CommandLine &) { // Also add services to After= in .service static const char *WaitingTasks[][6] = { |