Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f84ea21a authored by Ben Chan's avatar Ben Chan Committed by chrome-internal-fetch
Browse files

crash-reporter: Use integer types from stdint.h 

This CL replaces the deprecated int* and uint* types from
'base/basictypes.h' with the int*_t and uint*_t types from 'stdint.h'.

BUG=chromium:401356
TEST=`FEATURES=test emerge-$BOARD platform2`

Change-Id: I33086d64b33ac7d58b578705e95da31e6d6fb5fd
Reviewed-on: https://chromium-review.googlesource.com/211285


Reviewed-by: default avatarMike Frysinger <vapier@chromium.org>
Tested-by: default avatarBen Chan <benchan@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>
parent 7589aff9

crash_reporter/chrome_collector.cc

+3 −2
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 


#include <glib.h>

#include <pcrecpp.h>

#include <stdint.h>



#include <string>

#include <vector>
@@ -171,8 +172,8 @@ bool ChromeCollector::HandleCrash(const FilePath &file_path, 
  }



  if (GetAdditionalLogs(log_path)) {

    int64 minidump_size = 0;

    int64 log_size = 0;

    int64_t minidump_size = 0;

    int64_t log_size = 0;

    if (base::GetFileSize(minidump_path, &minidump_size) &&

        base::GetFileSize(log_path, &log_size) &&

        minidump_size > 0 && log_size > 0 &&

crash_reporter/crash_collector.cc

+1 −1
Original line number Diff line number Diff line
@@ -509,7 +509,7 @@ void CrashCollector::WriteCrashMetaData(const FilePath &meta_path, 
  if ((i = contents.find("CHROMEOS_RELEASE_VERSION")) != contents.end()) {

    version = i->second;

  }

  int64 payload_size = -1;

  int64_t payload_size = -1;

  base::GetFileSize(FilePath(payload_path), &payload_size);

  std::string meta_data = StringPrintf("%sexec_name=%s\n"

                                       "ver=%s\n"

crash_reporter/user_collector.cc

+2 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <grp.h>  // For struct group.

#include <pcrecpp.h>

#include <pwd.h>  // For struct passwd.

#include <stdint.h>

#include <sys/types.h>  // For getpwuid_r, getgrnam_r, WEXITSTATUS.



#include <set>
@@ -248,7 +249,7 @@ bool UserCollector::CopyOffProcFiles(pid_t pid, 
bool UserCollector::ValidateProcFiles(const FilePath &container_dir) const {

  // Check if the maps file is empty, which could be due to the crashed

  // process being reaped by the kernel before finishing a core dump.

  int64 file_size = 0;

  int64_t file_size = 0;

  if (!base::GetFileSize(container_dir.Append("maps"), &file_size)) {

    LOG(ERROR) << "Could not get the size of maps file";

    return false;