diff options
author | David Kalnischkies <david@kalnischkies.de> | 2014-01-16 19:51:23 +0100 |
---|---|---|
committer | David Kalnischkies <david@kalnischkies.de> | 2014-01-16 19:51:23 +0100 |
commit | 62d8a765b9b37354efab6ca838cbdb7f347f7cac (patch) | |
tree | 4bd41cf6076cf264640ab2296f41c88379fecf44 /apt-pkg/aptconfiguration.cc | |
parent | bee0670b2dc8c50ddfc65731c00383da4d377cae (diff) |
rework some code to fix some scan-build warnings
No visible functional changes, just code moved around and additional
checks to eliminate impossible branches
Reported-By: scan-build
Git-Dch: Ignore
Diffstat (limited to 'apt-pkg/aptconfiguration.cc')
-rw-r--r-- | apt-pkg/aptconfiguration.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index 115d11616..1ebcf97bc 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -141,7 +141,7 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All, // so they will be all included in the Cache. std::vector<string> builtin; DIR *D = opendir(_config->FindDir("Dir::State::lists").c_str()); - if (D != 0) { + if (D != NULL) { builtin.push_back("none"); for (struct dirent *Ent = readdir(D); Ent != 0; Ent = readdir(D)) { string const name = SubstVar(Ent->d_name, "%5f", "_"); @@ -166,8 +166,8 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All, continue; builtin.push_back(c); } + closedir(D); } - closedir(D); // FIXME: Remove support for the old APT::Acquire::Translation // it was undocumented and so it should be not very widthly used |