diff options
author | Kate Stone <katherine.stone@apple.com> | 2016-09-06 20:57:50 +0000 |
---|---|---|
committer | Kate Stone <katherine.stone@apple.com> | 2016-09-06 20:57:50 +0000 |
commit | b9c1b51e45b845debb76d8658edabca70ca56079 (patch) | |
tree | dfcb5a13ef2b014202340f47036da383eaee74aa /lldb/source/Host/common/OptionParser.cpp | |
parent | d5aa73376966339caad04013510626ec2e42c760 (diff) | |
download | bcm5719-llvm-b9c1b51e45b845debb76d8658edabca70ca56079.tar.gz bcm5719-llvm-b9c1b51e45b845debb76d8658edabca70ca56079.zip |
*** This commit represents a complete reformatting of the LLDB source code
*** to conform to clang-format’s LLVM style. This kind of mass change has
*** two obvious implications:
Firstly, merging this particular commit into a downstream fork may be a huge
effort. Alternatively, it may be worth merging all changes up to this commit,
performing the same reformatting operation locally, and then discarding the
merge for this particular commit. The commands used to accomplish this
reformatting were as follows (with current working directory as the root of
the repository):
find . \( -iname "*.c" -or -iname "*.cpp" -or -iname "*.h" -or -iname "*.mm" \) -exec clang-format -i {} +
find . -iname "*.py" -exec autopep8 --in-place --aggressive --aggressive {} + ;
The version of clang-format used was 3.9.0, and autopep8 was 1.2.4.
Secondly, “blame” style tools will generally point to this commit instead of
a meaningful prior commit. There are alternatives available that will attempt
to look through this change and find the appropriate prior commit. YMMV.
llvm-svn: 280751
Diffstat (limited to 'lldb/source/Host/common/OptionParser.cpp')
-rw-r--r-- | lldb/source/Host/common/OptionParser.cpp | 135 |
1 files changed, 50 insertions, 85 deletions
diff --git a/lldb/source/Host/common/OptionParser.cpp b/lldb/source/Host/common/OptionParser.cpp index 16a29a1583d..053179c19ee 100644 --- a/lldb/source/Host/common/OptionParser.cpp +++ b/lldb/source/Host/common/OptionParser.cpp @@ -15,102 +15,67 @@ using namespace lldb_private; -void -OptionParser::Prepare(std::unique_lock<std::mutex> &lock) -{ - static std::mutex g_mutex; - lock = std::unique_lock<std::mutex>(g_mutex); +void OptionParser::Prepare(std::unique_lock<std::mutex> &lock) { + static std::mutex g_mutex; + lock = std::unique_lock<std::mutex>(g_mutex); #ifdef __GLIBC__ - optind = 0; + optind = 0; #else - optreset = 1; - optind = 1; + optreset = 1; + optind = 1; #endif } -void -OptionParser::EnableError(bool error) -{ - opterr = error ? 1 : 0; -} +void OptionParser::EnableError(bool error) { opterr = error ? 1 : 0; } -int -OptionParser::Parse (int argc, - char * const argv [], - const char *optstring, - const Option *longopts, - int *longindex) -{ - std::vector<option> opts; - while (longopts->definition != nullptr) - { - option opt; - opt.flag = longopts->flag; - opt.val = longopts->val; - opt.name = longopts->definition->long_option; - opt.has_arg = longopts->definition->option_has_arg; - opts.push_back(opt); - ++longopts; - } - opts.push_back(option()); - return getopt_long_only(argc, argv, optstring, &opts[0], longindex); +int OptionParser::Parse(int argc, char *const argv[], const char *optstring, + const Option *longopts, int *longindex) { + std::vector<option> opts; + while (longopts->definition != nullptr) { + option opt; + opt.flag = longopts->flag; + opt.val = longopts->val; + opt.name = longopts->definition->long_option; + opt.has_arg = longopts->definition->option_has_arg; + opts.push_back(opt); + ++longopts; + } + opts.push_back(option()); + return getopt_long_only(argc, argv, optstring, &opts[0], longindex); } -char* -OptionParser::GetOptionArgument() -{ - return optarg; -} +char *OptionParser::GetOptionArgument() { return optarg; } -int -OptionParser::GetOptionIndex() -{ - return optind; -} +int OptionParser::GetOptionIndex() { return optind; } -int -OptionParser::GetOptionErrorCause() -{ - return optopt; -} +int OptionParser::GetOptionErrorCause() { return optopt; } -std::string -OptionParser::GetShortOptionString(struct option *long_options) -{ - std::string s; - int i=0; - bool done = false; - while (!done) - { - if (long_options[i].name == 0 && - long_options[i].has_arg == 0 && - long_options[i].flag == 0 && - long_options[i].val == 0) - { - done = true; - } - else - { - if (long_options[i].flag == NULL && - isalpha(long_options[i].val)) - { - s.append(1, (char)long_options[i].val); - switch (long_options[i].has_arg) - { - default: - case no_argument: - break; - - case optional_argument: - s.append(2, ':'); - break; - case required_argument: - s.append(1, ':'); - break; - } - } - ++i; +std::string OptionParser::GetShortOptionString(struct option *long_options) { + std::string s; + int i = 0; + bool done = false; + while (!done) { + if (long_options[i].name == 0 && long_options[i].has_arg == 0 && + long_options[i].flag == 0 && long_options[i].val == 0) { + done = true; + } else { + if (long_options[i].flag == NULL && isalpha(long_options[i].val)) { + s.append(1, (char)long_options[i].val); + switch (long_options[i].has_arg) { + default: + case no_argument: + break; + + case optional_argument: + s.append(2, ':'); + break; + case required_argument: + s.append(1, ':'); + break; } + } + ++i; } - return s; + } + return s; } |