avoid triggering gcc's -Wunsafe-loop-optimizations in EDSP

[apt.git] / cmdline / apt-internal-solver.cc

diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc
index 90800e1d91d0ec1bc41078b7cf2d5b6e337070c0..2df1d3bef32efa9632490fec979a96999b42600f 100644 (file)
--- a/cmdline/apt-internal-solver.cc
+++ b/cmdline/apt-internal-solver.cc
@@ -41,7 +41,7 @@
 #include <apti18n.h>
                                                                        /*}}}*/
 
-bool ShowHelp(CommandLine &)                                           /*{{{*/
+static bool ShowHelp(CommandLine &)                                    /*{{{*/
 {
        std::cout <<
                _("Usage: apt-internal-solver\n"
@@ -58,7 +58,7 @@ APT_NORETURN static void DIE(std::string const &message) {            /*{{{*/
        exit(EXIT_FAILURE);
 }
                                                                        /*}}}*/
-std::vector<aptDispatchWithHelp> GetCommands()                         /*{{{*/
+static std::vector<aptDispatchWithHelp> GetCommands()                  /*{{{*/
 {
    return {};
 }
@@ -82,12 +82,14 @@ int main(int argc,const char *argv[])                                       /*{{{*/
                pkgCacheFile CacheFile;
                CacheFile.Open(NULL, false);
                APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1);
-               FILE* output = stdout;
+               FileFd output;
+               if (output.OpenDescriptor(STDOUT_FILENO, FileFd::WriteOnly | FileFd::BufferedWrite, true) == false)
+                       return 2;
                if (pkgset.empty() == true)
                        EDSP::WriteScenario(CacheFile, output);
                else
                        EDSP::WriteLimitedScenario(CacheFile, output, pkgset);
-               fclose(output);
+               output.Close();
                _error->DumpErrors(std::cerr);
                return 0;
        }
@@ -102,8 +104,10 @@ int main(int argc,const char *argv[])                                      /*{{{*/
        _config->Set("APT::System", "Debian APT solver interface");
        _config->Set("APT::Solver", "internal");
        _config->Set("edsp::scenario", "/nonexistent/stdin");
-       int input = STDIN_FILENO;
-       FILE* output = stdout;
+       FileFd output;
+       if (output.OpenDescriptor(STDOUT_FILENO, FileFd::WriteOnly | FileFd::BufferedWrite, true) == false)
+          DIE("stdout couldn't be opened");
+       int const input = STDIN_FILENO;
        SetNonBlock(input, false);
 
        EDSP::WriteProgress(0, "Start up solver…", output);