diff options
Diffstat (limited to 'Userland/Libraries/LibCore/ArgsParser.cpp')
| -rw-r--r-- | Userland/Libraries/LibCore/ArgsParser.cpp | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/Userland/Libraries/LibCore/ArgsParser.cpp b/Userland/Libraries/LibCore/ArgsParser.cpp index a339b8a0bd..ced9d32548 100644 --- a/Userland/Libraries/LibCore/ArgsParser.cpp +++ b/Userland/Libraries/LibCore/ArgsParser.cpp @@ -16,7 +16,7 @@ #include <stdio.h> #include <string.h> -static Optional<double> convert_to_double(const char* s) +static Optional<double> convert_to_double(char const* s) { char* p; double v = strtod(s, &p); @@ -103,7 +103,7 @@ bool ArgsParser::parse(int argc, char* const* argv, FailureBehavior failure_beha } VERIFY(found_option); - const char* arg = found_option->requires_argument ? optarg : nullptr; + char const* arg = found_option->requires_argument ? optarg : nullptr; if (!found_option->accept_value(arg)) { warnln("\033[31mInvalid value for option \033[1m{}\033[22m\033[0m", found_option->name_for_display()); fail(); @@ -171,7 +171,7 @@ bool ArgsParser::parse(int argc, char* const* argv, FailureBehavior failure_beha for (size_t i = 0; i < m_positional_args.size(); i++) { auto& arg = m_positional_args[i]; for (int j = 0; j < num_values_for_arg[i]; j++) { - const char* value = argv[optind++]; + char const* value = argv[optind++]; if (!arg.accept_value(value)) { warnln("Invalid value for argument {}", arg.name); fail(); @@ -183,7 +183,7 @@ bool ArgsParser::parse(int argc, char* const* argv, FailureBehavior failure_beha return true; } -void ArgsParser::print_usage(FILE* file, const char* argv0) +void ArgsParser::print_usage(FILE* file, char const* argv0) { char const* env_preference = getenv("ARGSPARSER_EMIT_MARKDOWN"); if (env_preference != nullptr && env_preference[0] == '1' && env_preference[1] == 0) { @@ -193,7 +193,7 @@ void ArgsParser::print_usage(FILE* file, const char* argv0) } } -void ArgsParser::print_usage_terminal(FILE* file, const char* argv0) +void ArgsParser::print_usage_terminal(FILE* file, char const* argv0) { out(file, "Usage:\n\t\033[1m{}\033[0m", argv0); @@ -264,7 +264,7 @@ void ArgsParser::print_usage_terminal(FILE* file, const char* argv0) } } -void ArgsParser::print_usage_markdown(FILE* file, const char* argv0) +void ArgsParser::print_usage_markdown(FILE* file, char const* argv0) { outln(file, "## Name\n\n{}", argv0); @@ -347,7 +347,7 @@ void ArgsParser::add_option(Option&& option) m_options.append(move(option)); } -void ArgsParser::add_ignored(const char* long_name, char short_name, bool hidden) +void ArgsParser::add_ignored(char const* long_name, char short_name, bool hidden) { Option option { false, @@ -355,7 +355,7 @@ void ArgsParser::add_ignored(const char* long_name, char short_name, bool hidden long_name, short_name, nullptr, - [](const char*) { + [](char const*) { return true; }, hidden, @@ -363,7 +363,7 @@ void ArgsParser::add_ignored(const char* long_name, char short_name, bool hidden add_option(move(option)); } -void ArgsParser::add_option(bool& value, const char* help_string, const char* long_name, char short_name, bool hidden) +void ArgsParser::add_option(bool& value, char const* help_string, char const* long_name, char short_name, bool hidden) { Option option { false, @@ -371,7 +371,7 @@ void ArgsParser::add_option(bool& value, const char* help_string, const char* lo long_name, short_name, nullptr, - [&value](const char* s) { + [&value](char const* s) { VERIFY(s == nullptr); value = true; return true; @@ -381,7 +381,7 @@ void ArgsParser::add_option(bool& value, const char* help_string, const char* lo add_option(move(option)); } -void ArgsParser::add_option(const char*& value, const char* help_string, const char* long_name, char short_name, const char* value_name, bool hidden) +void ArgsParser::add_option(char const*& value, char const* help_string, char const* long_name, char short_name, char const* value_name, bool hidden) { Option option { true, @@ -389,7 +389,7 @@ void ArgsParser::add_option(const char*& value, const char* help_string, const c long_name, short_name, value_name, - [&value](const char* s) { + [&value](char const* s) { value = s; return true; }, @@ -398,7 +398,7 @@ void ArgsParser::add_option(const char*& value, const char* help_string, const c add_option(move(option)); } -void ArgsParser::add_option(String& value, const char* help_string, const char* long_name, char short_name, const char* value_name, bool hidden) +void ArgsParser::add_option(String& value, char const* help_string, char const* long_name, char short_name, char const* value_name, bool hidden) { Option option { true, @@ -406,7 +406,7 @@ void ArgsParser::add_option(String& value, const char* help_string, const char* long_name, short_name, value_name, - [&value](const char* s) { + [&value](char const* s) { value = s; return true; }, @@ -423,7 +423,7 @@ void ArgsParser::add_option(StringView& value, char const* help_string, char con long_name, short_name, value_name, - [&value](const char* s) { + [&value](char const* s) { value = s; return true; }, @@ -432,7 +432,7 @@ void ArgsParser::add_option(StringView& value, char const* help_string, char con add_option(move(option)); } -void ArgsParser::add_option(int& value, const char* help_string, const char* long_name, char short_name, const char* value_name, bool hidden) +void ArgsParser::add_option(int& value, char const* help_string, char const* long_name, char short_name, char const* value_name, bool hidden) { Option option { true, @@ -440,7 +440,7 @@ void ArgsParser::add_option(int& value, const char* help_string, const char* lon long_name, short_name, value_name, - [&value](const char* s) { + [&value](char const* s) { auto opt = StringView(s).to_int(); value = opt.value_or(0); return opt.has_value(); @@ -450,7 +450,7 @@ void ArgsParser::add_option(int& value, const char* help_string, const char* lon add_option(move(option)); } -void ArgsParser::add_option(unsigned& value, const char* help_string, const char* long_name, char short_name, const char* value_name, bool hidden) +void ArgsParser::add_option(unsigned& value, char const* help_string, char const* long_name, char short_name, char const* value_name, bool hidden) { Option option { true, @@ -458,7 +458,7 @@ void ArgsParser::add_option(unsigned& value, const char* help_string, const char long_name, short_name, value_name, - [&value](const char* s) { + [&value](char const* s) { auto opt = StringView(s).to_uint(); value = opt.value_or(0); return opt.has_value(); @@ -468,7 +468,7 @@ void ArgsParser::add_option(unsigned& value, const char* help_string, const char add_option(move(option)); } -void ArgsParser::add_option(double& value, const char* help_string, const char* long_name, char short_name, const char* value_name, bool hidden) +void ArgsParser::add_option(double& value, char const* help_string, char const* long_name, char short_name, char const* value_name, bool hidden) { Option option { true, @@ -476,7 +476,7 @@ void ArgsParser::add_option(double& value, const char* help_string, const char* long_name, short_name, value_name, - [&value](const char* s) { + [&value](char const* s) { auto opt = convert_to_double(s); value = opt.value_or(0.0); return opt.has_value(); @@ -486,7 +486,7 @@ void ArgsParser::add_option(double& value, const char* help_string, const char* add_option(move(option)); } -void ArgsParser::add_option(Optional<double>& value, const char* help_string, const char* long_name, char short_name, const char* value_name, bool hidden) +void ArgsParser::add_option(Optional<double>& value, char const* help_string, char const* long_name, char short_name, char const* value_name, bool hidden) { Option option { true, @@ -494,7 +494,7 @@ void ArgsParser::add_option(Optional<double>& value, const char* help_string, co long_name, short_name, value_name, - [&value](const char* s) { + [&value](char const* s) { value = convert_to_double(s); return value.has_value(); }, @@ -503,7 +503,7 @@ void ArgsParser::add_option(Optional<double>& value, const char* help_string, co add_option(move(option)); } -void ArgsParser::add_option(Optional<size_t>& value, const char* help_string, const char* long_name, char short_name, const char* value_name, bool hidden) +void ArgsParser::add_option(Optional<size_t>& value, char const* help_string, char const* long_name, char short_name, char const* value_name, bool hidden) { Option option { true, @@ -511,7 +511,7 @@ void ArgsParser::add_option(Optional<size_t>& value, const char* help_string, co long_name, short_name, value_name, - [&value](const char* s) { + [&value](char const* s) { value = AK::StringUtils::convert_to_uint<size_t>(s); return value.has_value(); }, @@ -551,14 +551,14 @@ void ArgsParser::add_positional_argument(Arg&& arg) m_positional_args.append(move(arg)); } -void ArgsParser::add_positional_argument(const char*& value, const char* help_string, const char* name, Required required) +void ArgsParser::add_positional_argument(char const*& value, char const* help_string, char const* name, Required required) { Arg arg { help_string, name, required == Required::Yes ? 1 : 0, 1, - [&value](const char* s) { + [&value](char const* s) { value = s; return true; } @@ -566,14 +566,14 @@ void ArgsParser::add_positional_argument(const char*& value, const char* help_st add_positional_argument(move(arg)); } -void ArgsParser::add_positional_argument(String& value, const char* help_string, const char* name, Required required) +void ArgsParser::add_positional_argument(String& value, char const* help_string, char const* name, Required required) { Arg arg { help_string, name, required == Required::Yes ? 1 : 0, 1, - [&value](const char* s) { + [&value](char const* s) { value = s; return true; } @@ -588,7 +588,7 @@ void ArgsParser::add_positional_argument(StringView& value, char const* help_str name, required == Required::Yes ? 1 : 0, 1, - [&value](const char* s) { + [&value](char const* s) { value = s; return true; } @@ -596,14 +596,14 @@ void ArgsParser::add_positional_argument(StringView& value, char const* help_str add_positional_argument(move(arg)); } -void ArgsParser::add_positional_argument(int& value, const char* help_string, const char* name, Required required) +void ArgsParser::add_positional_argument(int& value, char const* help_string, char const* name, Required required) { Arg arg { help_string, name, required == Required::Yes ? 1 : 0, 1, - [&value](const char* s) { + [&value](char const* s) { auto opt = StringView(s).to_int(); value = opt.value_or(0); return opt.has_value(); @@ -612,14 +612,14 @@ void ArgsParser::add_positional_argument(int& value, const char* help_string, co add_positional_argument(move(arg)); } -void ArgsParser::add_positional_argument(unsigned& value, const char* help_string, const char* name, Required required) +void ArgsParser::add_positional_argument(unsigned& value, char const* help_string, char const* name, Required required) { Arg arg { help_string, name, required == Required::Yes ? 1 : 0, 1, - [&value](const char* s) { + [&value](char const* s) { auto opt = StringView(s).to_uint(); value = opt.value_or(0); return opt.has_value(); @@ -628,14 +628,14 @@ void ArgsParser::add_positional_argument(unsigned& value, const char* help_strin add_positional_argument(move(arg)); } -void ArgsParser::add_positional_argument(double& value, const char* help_string, const char* name, Required required) +void ArgsParser::add_positional_argument(double& value, char const* help_string, char const* name, Required required) { Arg arg { help_string, name, required == Required::Yes ? 1 : 0, 1, - [&value](const char* s) { + [&value](char const* s) { auto opt = convert_to_double(s); value = opt.value_or(0.0); return opt.has_value(); @@ -644,14 +644,14 @@ void ArgsParser::add_positional_argument(double& value, const char* help_string, add_positional_argument(move(arg)); } -void ArgsParser::add_positional_argument(Vector<const char*>& values, const char* help_string, const char* name, Required required) +void ArgsParser::add_positional_argument(Vector<char const*>& values, char const* help_string, char const* name, Required required) { Arg arg { help_string, name, required == Required::Yes ? 1 : 0, INT_MAX, - [&values](const char* s) { + [&values](char const* s) { values.append(s); return true; } |