Release 1.1.10

[apt.git] / apt-private / private-cmndline.h

diff --git a/apt-private/private-cmndline.h b/apt-private/private-cmndline.h
index aee679bf899c93a81383825d0a9827ec67fdc34f..6235ef9f5870a356a17a11bceb1d1c7d405aba8e 100644 (file)
--- a/apt-private/private-cmndline.h
+++ b/apt-private/private-cmndline.h
@@ -22,13 +22,17 @@ enum class APT_CMD {
    APT_MARK,
    APT_SORTPKG,
 };
    APT_MARK,
    APT_SORTPKG,
 };

+struct aptDispatchWithHelp
+{
+   const char *Match;
+   bool (*Handler)(CommandLine &);
+   const char *Help;
+};

 
 

-bool ShowHelp(CommandLine &CmdL, CommandLine::DispatchWithHelp const * Cmds);
-std::vector<CommandLine::DispatchWithHelp> GetCommands();
-
-APT_PUBLIC std::vector<CommandLine::DispatchWithHelp> ParseCommandLine(CommandLine &CmdL, APT_CMD const Binary,
-      Configuration * const * const Cnf, pkgSystem ** const Sys, int const argc, const char * argv[]);
-APT_PUBLIC unsigned short DispatchCommandLine(CommandLine &CmdL, std::vector<CommandLine::DispatchWithHelp> const &Cmds);
+APT_PUBLIC std::vector<CommandLine::Dispatch> ParseCommandLine(CommandLine &CmdL, APT_CMD const Binary,
+      Configuration * const * const Cnf, pkgSystem ** const Sys, int const argc, const char * argv[],
+      bool (*ShowHelp)(CommandLine &), std::vector<aptDispatchWithHelp> (*GetCommands)(void));
+APT_PUBLIC unsigned short DispatchCommandLine(CommandLine &CmdL, std::vector<CommandLine::Dispatch> const &Cmds);

 
 APT_PUBLIC std::vector<CommandLine::Args> getCommandArgs(APT_CMD const Program, char const * const Cmd);
 
 
 APT_PUBLIC std::vector<CommandLine::Args> getCommandArgs(APT_CMD const Program, char const * const Cmd);