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

third_party/tcmalloc/chromium/src/windows/nm-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 162 matching lines @@
 #endif
 
   /* Contents */
 #ifdef VC8_OR_ABOVE   /* TODO(csilvers): figure out how to tell */
   PrintAvailability("Line numbers", module_info.LineNumbers);
   PrintAvailability("Global symbols", module_info.GlobalSymbols);
   PrintAvailability("Type information", module_info.TypeInfo);
 #endif
 }
 
-void usage() {
-  fprintf(stderr, "usage: nm-pdb [-C|--demangle] <module or filename>\n");
-}
-
 int main(int argc, char *argv[]) {
   DWORD  error;
   HANDLE process;
   ULONG64 module_base;
   SYM_CONTEXT ctx;
   int i;
   char* search;
   char* filename = NULL;
   int rv = 0;
   /* We may add SYMOPT_UNDNAME if --demangle is specified: */
   DWORD symopts = SYMOPT_DEFERRED_LOADS | SYMOPT_DEBUG;
 
   for (i = 1; i < argc; i++) {
     if (strcmp(argv[i], "--demangle") == 0 || strcmp(argv[i], "-C") == 0) {
       symopts |= SYMOPT_UNDNAME;
-    } else if (strcmp(argv[i], "--help") == 0) {
-      usage();
-      exit(0);
     } else {
       break;
     }
   }
   if (i != argc - 1) {
-    usage();
+    fprintf(stderr, "usage: nm-pdb [-C|--demangle] <module or filename>\n");
     exit(1);
   }
   filename = argv[i];
 
   process = GetCurrentProcess();
 
   if (!SymInitialize(process, NULL, FALSE)) {
     error = GetLastError();
     fprintf(stderr, "SymInitialize returned error : %d\n", error);
     return 1;
@@ skipping 43 matching lines @@
     qsort(ctx.syms, ctx.syms_len, sizeof(ctx.syms[0]), sym_cmp);
     for (j = 0; j < ctx.syms_len; j++) {
       printf("%016I64x X %s\n", ctx.syms[j].addr, ctx.syms[j].name);
     }
     /* In a perfect world, maybe we'd clean up ctx's memory? */
   }
   SymUnloadModule64(process, module_base);
   SymCleanup(process);
   return rv;
 }