This change allows compiling the sym_upload and minidump_upload using a global ::string class inste…

src/tools/linux/symupload/minidump_upload.cc

 // Copyright (c) 2006, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 23 matching lines @@
 //  ver: the product version
 //  symbol_file: the breakpad format symbol file
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
 #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,
                                          "upload_file_minidump",
                                          options->proxy,
                                          options->proxy_user_pwd,
                                          "",
                                          &response,
                                          NULL,
                                          &error);
 
   if (success) {
     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;
 }
 
 //=============================================================================
 static void
 Usage(int argc, const char *argv[]) {
   fprintf(stderr, "Submit minidump information.\n");
   fprintf(stderr, "Usage: %s [options...] -p <product> -v <version> <minidump> "
           "<upload-URL>\n", argv[0]);
   fprintf(stderr, "Options:\n");
   fprintf(stderr, "<minidump> should be a minidump.\n");
   fprintf(stderr, "<upload-URL> is the destination for the upload\n");
 
   fprintf(stderr, "-p:\t <product> Product name\n");
   fprintf(stderr, "-v:\t <version> Product version\n");
   fprintf(stderr, "-x:\t <host[:port]> Use HTTP proxy on given port\n");
   fprintf(stderr, "-u:\t <user[:password]> Set proxy user and password\n");
   fprintf(stderr, "-h:\t Usage\n");
   fprintf(stderr, "-?:\t Usage\n");
 }
 
 //=============================================================================
 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) {
       case 'p':
         options->product = optarg;
         break;
       case 'u':
         options->proxy_user_pwd = optarg;
         break;
       case 'v':
         options->version = optarg;
         break;
       case 'x':
         options->proxy = optarg;
         break;
 
       default:
+        fprintf(stderr, "Invalid option '%c'\n", ch);
         Usage(argc, argv);
-        exit(0);
+        exit(1);
         break;
     }
   }
 
   if ((argc - optind) != 2) {
     fprintf(stderr, "%s: Missing symbols file and/or upload-URL\n", argv[0]);
     Usage(argc, argv);
     exit(1);
   }
 
   options->minidumpPath = argv[optind];
   options->uploadURLStr = argv[optind + 1];
 }
 
 //=============================================================================
-int main (int argc, const char * argv[]) {
+int main(int argc, const char * argv[]) {

[Mark Mentovai, 2013/04/23 19:56:16]

Since you’re fixing this line, fix the * too. It should be either on char or on
argv but never alone like this. This file’s style favors putting it on argv.

[Ivan Penkov, 2013/04/23 20:29:43]

Done.

   Options options;
   SetupOptions(argc, argv, &options);
   Start(&options);
   return options.success ? 0 : 1;
 }