Not /not/ immediately mapping a file is INSANE :/.

[apt.git] / cmdline / apt-cdrom.cc

diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index d8a2d84cf3bc37b51384c4de0de0b32421e19515..bac808a416e4beb2fe3a3451a8f61f586edea6d2 100644 (file)
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -203,7 +203,7 @@ static bool DoIdent(CommandLine &)
    return AddOrIdent(false);
 }
                                                                        /*}}}*/
    return AddOrIdent(false);
 }
                                                                        /*}}}*/

-bool ShowHelp(CommandLine &)                                           /*{{{*/
+static bool ShowHelp(CommandLine &)                                    /*{{{*/

 {
    std::cout <<
       _("Usage: apt-cdrom [options] command\n"
 {
    std::cout <<
       _("Usage: apt-cdrom [options] command\n"


@@ -214,7 +214,7 @@ bool ShowHelp(CommandLine &)                                                /*{{{*/
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-std::vector<aptDispatchWithHelp> GetCommands()                         /*{{{*/
+static std::vector<aptDispatchWithHelp> GetCommands()                  /*{{{*/

 {
    return {
       {"add", &DoAdd, "Add a CDROM"},
 {
    return {
       {"add", &DoAdd, "Add a CDROM"},


@@ -225,8 +225,6 @@ std::vector<aptDispatchWithHelp> GetCommands()                              /*{{{*/
                                                                        /*}}}*/
 int main(int argc,const char *argv[])                                  /*{{{*/
 {
                                                                        /*}}}*/
 int main(int argc,const char *argv[])                                  /*{{{*/
 {

-   InitLocale();
-

    // Parse the command line and initialize the package library
    CommandLine CmdL;
    auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT_CDROM, &_config, &_system, argc, argv, &ShowHelp, &GetCommands);
    // Parse the command line and initialize the package library
    CommandLine CmdL;
    auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT_CDROM, &_config, &_system, argc, argv, &ShowHelp, &GetCommands);