commit ababc5c0bbb153c83a09c5775d8a050ccb514510
author Chris Sosa <sosa@chromium.org> Wed Apr 09 15:42:01 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri Apr 11 20:02:13 2014 +0000
tree ceae4a03d6b2c25bf15f797d68ac9e181a8c0e10
parent aa3f29c9ba4ca1e3aedd8558d2f4ec937cb026c5

Use base::Commandline instead of gflags (removes -fno-strict-aliasing).

Small CL that does a little refactoring of command lines to use
base::CommandLine. I also cleaned up buffet_client parsing args to better
use base::CommandLine rather than parsing argv.

BUG=chromium:356745
TEST=Built it

Change-Id: I2b5eb9ebc8b41e3df92ddbce9ad4fe97f51362c2
Reviewed-on: https://chromium-review.googlesource.com/193939
Reviewed-by: Chris Sosa <sosa@chromium.org>
Tested-by: Chris Sosa <sosa@chromium.org>
Commit-Queue: Chris Sosa <sosa@chromium.org>

buffet/buffet_client.cc

diff --git a/buffet/buffet_client.cc b/buffet/buffet_client.cc
index 9568834..edd6e87 100755
--- a/buffet/buffet_client.cc
+++ b/buffet/buffet_client.cc
@@ -5,11 +5,13 @@
 #include <iostream>
 #include <string>
 
+#include <base/command_line.h>
 #include <base/logging.h>
 #include <base/memory/scoped_ptr.h>
 #include <dbus/bus.h>
 #include <dbus/object_proxy.h>
 #include <dbus/message.h>
+#include <sysexits.h>
 
 #include "buffet/dbus_constants.h"
 #include "buffet/dbus_manager.h"
@@ -97,53 +99,59 @@
 } // namespace
 
 int main(int argc, char** argv) {
+  CommandLine::Init(argc, argv);
+  CommandLine* cl = CommandLine::ForCurrentProcess();
+
   dbus::Bus::Options options;
   options.bus_type = dbus::Bus::SYSTEM;
   scoped_refptr<dbus::Bus> bus(new dbus::Bus(options));
 
-  if (argc < 2) {
+  CommandLine::StringVector args = cl->GetArgs();
+  if (args.size() < 1) {
     usage();
-    return -1;
+    return EX_USAGE;
   }
 
-  char* command = argv[1];
+  // Pop the command off of the args list.
+  std::string command = args[0];
+  args.erase(args.begin());
   bool success = false;
-  if (strcmp(command, kRootTestMethod) == 0) {
+  if (command.compare(kRootTestMethod) == 0) {
     auto proxy = GetBuffetDBusProxy(
         bus, buffet::dbus_constants::kRootServicePath);
     success = CallTestMethod(proxy);
-  } else if (strcmp(command, kManagerRegisterDeviceMethod) == 0) {
-    if (argc != 5) {
+  } else if (command.compare(kManagerRegisterDeviceMethod) == 0) {
+    if (args.size() != 3) {
       std::cerr << "Invalid number of arguments for "
                 << "Manager.RegisterDevice" << std::endl;
       usage();
-      return -1;
+      return EX_USAGE;
     }
     auto proxy = GetBuffetDBusProxy(
         bus, buffet::dbus_constants::kManagerServicePath);
-    success = CallManagerRegisterDevice(proxy, argv[2], argv[3], argv[4]);
-  } else if (strcmp(command, kManagerUpdateStateMethod) == 0) {
-    if (argc != 3) {
+    success = CallManagerRegisterDevice(proxy, args[0], args[1], args[2]);
+  } else if (command.compare(kManagerUpdateStateMethod) == 0) {
+    if (args.size() != 1) {
       std::cerr << "Invalid number of arguments for "
                 << "Manager.UpdateState" << std::endl;
       usage();
-      return -1;
+      return EX_USAGE;
     }
     auto proxy = GetBuffetDBusProxy(
         bus, buffet::dbus_constants::kManagerServicePath);
-    success = CallManagerUpdateState(proxy, argv[2]);
+    success = CallManagerUpdateState(proxy, args[0]);
   } else {
-    std::cerr << "Unkown command: " << command << std::endl;
+    std::cerr << "Unknown command: " << command << std::endl;
     usage();
-    return -1;
+    return EX_USAGE;
   }
 
   if (success) {
     std::cout << "Done." << std::endl;
-    return 0;
+    return EX_OK;
   }
 
-  std::cout << "Done, with errors." << std::endl;
-  return -1;
+  std::cerr << "Done, with errors." << std::endl;
+  return 1;
 }