1 files changed, 51 insertions, 85 deletions
diff --git a/source/Host/common/OptionParser.cpp b/source/Host/common/OptionParser.cpp
index 16a29a1583d5..d78bf335b408 100644
--- a/source/Host/common/OptionParser.cpp
+++ b/source/Host/common/OptionParser.cpp
@@ -15,102 +15,68 @@
 
 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[], llvm::StringRef 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());
+  std::string opt_cstr = optstring;
+  return getopt_long_only(argc, argv, opt_cstr.c_str(), &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;
 }