Use stdint types everywhere.

src/processor/basic_source_line_resolver.cc

 // Copyright (c) 2010 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 282 matching lines @@
 BasicSourceLineResolver::Function*
 BasicSourceLineResolver::Module::ParseFunction(char *function_line) {
   // FUNC <address> <size> <stack_param_size> <name>
   function_line += 5;  // skip prefix
 
   vector<char*> tokens;
   if (!Tokenize(function_line, kWhitespace, 4, &tokens)) {
     return NULL;
   }
 
-  u_int64_t address    = strtoull(tokens[0], NULL, 16);
-  u_int64_t size       = strtoull(tokens[1], NULL, 16);
+  uint64_t address    = strtoull(tokens[0], NULL, 16);

[Mark Mentovai, 2013/03/04 20:24:46]

Alignment, throughout this file.

+  uint64_t size       = strtoull(tokens[1], NULL, 16);
   int stack_param_size = strtoull(tokens[2], NULL, 16);
   char *name           = tokens[3];
 
   return new Function(name, address, size, stack_param_size);
 }
 
 BasicSourceLineResolver::Line* BasicSourceLineResolver::Module::ParseLine(
     char *line_line) {
   // <address> <line number> <source file id>
   vector<char*> tokens;
   if (!Tokenize(line_line, kWhitespace, 4, &tokens)) {
     return NULL;
   }
 
-  u_int64_t address = strtoull(tokens[0], NULL, 16);
-  u_int64_t size    = strtoull(tokens[1], NULL, 16);
+  uint64_t address = strtoull(tokens[0], NULL, 16);
+  uint64_t size    = strtoull(tokens[1], NULL, 16);
   int line_number   = atoi(tokens[2]);
   int source_file   = atoi(tokens[3]);
   if (line_number <= 0) {
     return NULL;
   }
 
   return new Line(address, size, source_file, line_number);
 }
 
 bool BasicSourceLineResolver::Module::ParsePublicSymbol(char *public_line) {
   // PUBLIC <address> <stack_param_size> <name>
 
   // Skip "PUBLIC " prefix.
   public_line += 7;
 
   vector<char*> tokens;
   if (!Tokenize(public_line, kWhitespace, 3, &tokens)) {
     return false;
   }
 
-  u_int64_t address    = strtoull(tokens[0], NULL, 16);
+  uint64_t address    = strtoull(tokens[0], NULL, 16);
   int stack_param_size = strtoull(tokens[1], NULL, 16);
   char *name           = tokens[2];
 
   // A few public symbols show up with an address of 0.  This has been seen
   // in the dumped output of ntdll.pdb for symbols such as _CIlog, _CIpow,
   // RtlDescribeChunkLZNT1, and RtlReserveChunkLZNT1.  They would conflict
   // with one another if they were allowed into the public_symbols_ map,
   // but since the address is obviously invalid, gracefully accept them
   // as input without putting them into the map.
   if (address == 0) {
@@ skipping 14 matching lines @@
   while (*stack_info_line == ' ')
     stack_info_line++;
   const char *platform = stack_info_line;
   while (!strchr(kWhitespace, *stack_info_line))
     stack_info_line++;
   *stack_info_line++ = '\0';
 
   // MSVC stack frame info.
   if (strcmp(platform, "WIN") == 0) {
     int type = 0;
-    u_int64_t rva, code_size;
+    uint64_t rva, code_size;
     linked_ptr<WindowsFrameInfo>
       stack_frame_info(WindowsFrameInfo::ParseFromString(stack_info_line,
                                                          type,
                                                          rva,
                                                          code_size));
     if (stack_frame_info == NULL)
       return false;
 
     // TODO(mmentovai): I wanted to use StoreRange's return value as this
     // method's return value, but MSVC infrequently outputs stack info that
@@ skipping 55 matching lines @@
   // This record has the form "STACK <address> <rules...>".
   char *address_field = init_or_address;
   char *delta_rules = strtok_r(NULL, "\r\n", &cursor);
   if (!delta_rules) return false;
   MemAddr address = strtoul(address_field, NULL, 16);
   cfi_delta_rules_[address] = delta_rules;
   return true;
 }
 
 }  // namespace google_breakpad