[NOT TO COMMIT!] r109: Diff of the current tcmalloc from the original google-perftools r109.

third_party/tcmalloc/chromium/src/windows/addr2line-pdb.c

 /* Copyright (c) 2008, 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 30 matching lines @@
 
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <windows.h>
 #include <dbghelp.h>
 
 #define SEARCH_CAP (1024*1024)
 #define WEBSYM "SRV*c:\\websymbols*http://msdl.microsoft.com/download/symbols"
 
-void usage() {
-  fprintf(stderr, "usage: "
-          "addr2line-pdb [-f|--functions] [-C|--demangle] [-e filename]\n");
-  fprintf(stderr, "(Then list the hex addresses on stdin, one per line)\n");
-}
-
 int main(int argc, char *argv[]) {
   DWORD  error;
   HANDLE process;
   ULONG64 module_base;
   int i;
   char* search;
   char buf[256];   /* Enough to hold one hex address, I trust! */
   int rv = 0;
   /* We may add SYMOPT_UNDNAME if --demangle is specified: */
   DWORD symopts = SYMOPT_DEFERRED_LOADS | SYMOPT_DEBUG | SYMOPT_LOAD_LINES;
   char* filename = "a.out";         /* The default if -e isn't specified */
   int print_function_name = 0;      /* Set to 1 if -f is specified */
 
   for (i = 1; i < argc; i++) {
     if (strcmp(argv[i], "--functions") == 0 || strcmp(argv[i], "-f") == 0) {
       print_function_name = 1;
     } else if (strcmp(argv[i], "--demangle") == 0 ||
                strcmp(argv[i], "-C") == 0) {
       symopts |= SYMOPT_UNDNAME;
     } else if (strcmp(argv[i], "-e") == 0) {
       if (i + 1 >= argc) {
         fprintf(stderr, "FATAL ERROR: -e must be followed by a filename\n");
         return 1;
       }
       filename = argv[i+1];
       i++;     /* to skip over filename too */
-    } else if (strcmp(argv[i], "--help") == 0) {
-      usage();
-      exit(0);
     } else {
-      usage();
+      fprintf(stderr, "usage: "
+              "addr2line-pdb [-f|--functions] [-C|--demangle] [-e filename]\n");
+      fprintf(stderr, "(Then list the hex addresses on stdin, one per line)\n");
       exit(1);
     }
   }
 
   process = GetCurrentProcess();
 
   if (!SymInitialize(process, NULL, FALSE)) {
     error = GetLastError();
     fprintf(stderr, "SymInitialize returned error : %d\n", error);
     return 1;
@@ skipping 56 matching lines @@
     if (SymGetLineFromAddr64(process, (DWORD64)addr, &dummy, &line)) {
       printf("%s:%d\n", line.FileName, (int)line.LineNumber);
     } else {
       printf("??:0\n");
     }
   }
   SymUnloadModule64(process, module_base);
   SymCleanup(process);
   return rv;
 }