summaryrefslogtreecommitdiff
path: root/apt-pkg/contrib/cmndline.h
diff options
context:
space:
mode:
Diffstat (limited to 'apt-pkg/contrib/cmndline.h')
-rw-r--r--apt-pkg/contrib/cmndline.h12
1 files changed, 2 insertions, 10 deletions
diff --git a/apt-pkg/contrib/cmndline.h b/apt-pkg/contrib/cmndline.h
index 33d9f9f3a..805cb9eae 100644
--- a/apt-pkg/contrib/cmndline.h
+++ b/apt-pkg/contrib/cmndline.h
@@ -84,14 +84,12 @@ class CommandLine
bool Parse(int argc,const char **argv);
void ShowHelp();
unsigned int FileSize() const APT_PURE;
+ // FIXME: merge on next ABI break
bool DispatchArg(Dispatch *List,bool NoMatch = true);
- bool DispatchArg(DispatchWithHelp const * const List,bool NoMatch = true);
+ bool DispatchArg(Dispatch const * const List,bool NoMatch = true);
static char const * GetCommand(Dispatch const * const Map,
unsigned int const argc, char const * const * const argv) APT_PURE;
- static char const * GetCommand(DispatchWithHelp const * const Map,
- unsigned int const argc, char const * const * const argv) APT_PURE;
-
static CommandLine::Args MakeArgs(char ShortOpt, char const *LongOpt,
char const *ConfName, unsigned long Flags) APT_CONST;
@@ -117,11 +115,5 @@ struct CommandLine::Dispatch
const char *Match;
bool (*Handler)(CommandLine &);
};
-struct CommandLine::DispatchWithHelp
-{
- const char *Match;
- bool (*Handler)(CommandLine &);
- const char *Help;
-};
#endif