oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

util/OptionParser: make string pointers "const"

Browse Source
This commit is contained in:
Max Kellermann 2018-01-16 10:17:09 +01:00
parent 36a6405e8b
commit 4a304bf34e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/util/OptionParser.cxx
View File

@ -40,7 +40,7 @@ bool
OptionParser::ParseNext() noexcept OptionParser::ParseNext() noexcept
{ {
assert(HasEntries()); assert(HasEntries());
char *arg = *argv; const char *arg = *argv;
++argv; ++argv;
--argc; --argc;
if (arg[0] == '-') { if (arg[0] == '-') {

10
src/util/OptionParser.hxx
View File

@ -30,16 +30,16 @@ class OptionDef;
class OptionParser class OptionParser
{ {
int argc; int argc;
char **argv; char *const*argv;
char *option = nullptr; const char *option = nullptr;
char *option_raw = nullptr; const char *option_raw = nullptr;
bool is_long = false; bool is_long = false;
public: public:
/** /**
* Constructs #OptionParser. * Constructs #OptionParser.
*/ */
constexpr OptionParser(int _argc, char **_argv) noexcept constexpr OptionParser(int _argc, char *const*_argv) noexcept
:argc(_argc - 1), argv(_argv + 1) {} :argc(_argc - 1), argv(_argv + 1) {}
/** /**
@ -52,7 +52,7 @@ public:
/** /**
* Gets the last parsed option. * Gets the last parsed option.
*/ */
char *GetOption() noexcept { const char *GetOption() noexcept {
assert(option_raw != nullptr); assert(option_raw != nullptr);
return option_raw; return option_raw;
} }