This change allows compiling sym_upload.cc and minidump_upload.cc using a global ::string class instead of std::string. For more details take a look at common/using_std_string.h

A few other fixes:

 - getopt() returns (int)(-1) when options are exhausted.  This was already sent out for code review by mattdr but only for sym_upload.cc (https://breakpad.appspot.com/561002/).  I'm applying the fix for both files.

 - Fixed a couple of lint warning about improper usage of white-spaces.

Thanks,
-Ivan
Review URL: https://breakpad.appspot.com/567002

git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1158 4c0a9323-5329-0410-9bdc-e9ce6186880e

1 files changed, 15 insertions, 13 deletions

diff --git a/src/tools/linux/symupload/minidump_upload.cc b/src/tools/linux/symupload/minidump_upload.cc
index 144c8bf6..94c3492c 100644
--- a/src/tools/linux/symupload/minidump_upload.cc
+++ b/src/tools/linux/symupload/minidump_upload.cc
@@ -41,28 +41,29 @@
 #include <string>
 
 #include "common/linux/http_upload.h"
+#include "common/using_std_string.h"
 
 using google_breakpad::HTTPUpload;
 
 struct Options {
-  std::string minidumpPath;
-  std::string uploadURLStr;
-  std::string product;
-  std::string version;
-  std::string proxy;
-  std::string proxy_user_pwd;
+  string minidumpPath;
+  string uploadURLStr;
+  string product;
+  string version;
+  string proxy;
+  string proxy_user_pwd;
   bool success;
 };
 
 //=============================================================================
 static void Start(Options *options) {
-  std::map<std::string, std::string> parameters;
+  std::map<string, string> parameters;
   // Add parameters
   parameters["prod"] = options->product;
   parameters["ver"] = options->version;
 
   // Send it
-  std::string response, error;
+  string response, error;
   bool success = HTTPUpload::SendRequest(options->uploadURLStr,
                                          parameters,
                                          options->minidumpPath,
@@ -78,9 +79,9 @@ static void Start(Options *options) {
     printf("Successfully sent the minidump file.\n");
   } else {
     printf("Failed to send minidump: %s\n", error.c_str());
-    printf("Response:\n");
-    printf("%s\n", response.c_str());
   }
+  printf("Response:\n");
+  printf("%s\n", response.c_str());
   options->success = success;
 }
 
@@ -106,7 +107,7 @@ Usage(int argc, const char *argv[]) {
 static void
 SetupOptions(int argc, const char *argv[], Options *options) {
   extern int optind;
-  char ch;
+  int ch;
 
   while ((ch = getopt(argc, (char * const *)argv, "p:u:v:x:h?")) != -1) {
     switch (ch) {
@@ -124,8 +125,9 @@ SetupOptions(int argc, const char *argv[], Options *options) {
         break;
 
       default:
+        fprintf(stderr, "Invalid option '%c'\n", ch);
         Usage(argc, argv);
-        exit(0);
+        exit(1);
         break;
     }
   }
@@ -141,7 +143,7 @@ SetupOptions(int argc, const char *argv[], Options *options) {
 }
 
 //=============================================================================
-int main (int argc, const char * argv[]) {
+int main(int argc, const char* argv[]) {
   Options options;
   SetupOptions(argc, argv, &options);
   Start(&options);