external/breakpad/breakpad-wshadow.patch.1

   1 diff -u -p -d -N -r breakpad.sav/src/client/linux/handler/minidump_descriptor.h breakpad/src/client/linux/handler/minidump_descriptor.h
   2 --- breakpad.sav/src/client/linux/handler/minidump_descriptor.h 2021-04-07 19:12:50.329462509 +0200
   3 +++ breakpad/src/client/linux/handler/minidump_descriptor.h     2021-04-07 19:29:58.526084027 +0200
   4 @@ -57,27 +57,27 @@ class MinidumpDescriptor {
   5          address_within_principal_mapping_(0),
   6          skip_dump_if_principal_mapping_not_referenced_(false) {}
   7
   8 -  explicit MinidumpDescriptor(const string& directory)
   9 +  explicit MinidumpDescriptor(const string& dir)
  10        : mode_(kWriteMinidumpToFile),
  11          fd_(-1),
  12 -        directory_(directory),
  13 +        directory_(dir),
  14          c_path_(NULL),
  15          size_limit_(-1),
  16          address_within_principal_mapping_(0),
  17          skip_dump_if_principal_mapping_not_referenced_(false),
  18          sanitize_stacks_(false) {
  19 -    assert(!directory.empty());
  20 +    assert(!dir.empty());
  21    }
  22
  23 -  explicit MinidumpDescriptor(int fd)
  24 +  explicit MinidumpDescriptor(int file_descriptor)
  25        : mode_(kWriteMinidumpToFd),
  26 -        fd_(fd),
  27 +        fd_(file_descriptor),
  28          c_path_(NULL),
  29          size_limit_(-1),
  30          address_within_principal_mapping_(0),
  31          skip_dump_if_principal_mapping_not_referenced_(false),
  32          sanitize_stacks_(false) {
  33 -    assert(fd != -1);
  34 +    assert(file_descriptor != -1);
  35    }
  36
  37    explicit MinidumpDescriptor(const MicrodumpOnConsole&)
  38 diff -u -p -d -N -r breakpad.sav/src/client/linux/minidump_writer/linux_dumper.h breakpad/src/client/linux/minidump_writer/linux_dumper.h
  39 --- breakpad.sav/src/client/linux/minidump_writer/linux_dumper.h        2021-04-07 19:12:50.329462509 +0200
  40 +++ breakpad/src/client/linux/minidump_writer/linux_dumper.h    2021-04-07 19:27:50.808928572 +0200
  41 @@ -176,12 +176,12 @@ class LinuxDumper {
  42    void SetCrashInfoFromSigInfo(const siginfo_t& siginfo);
  43
  44    uintptr_t crash_address() const { return crash_address_; }
  45 -  void set_crash_address(uintptr_t crash_address) {
  46 -    crash_address_ = crash_address;
  47 +  void set_crash_address(uintptr_t crash_addr) {
  48 +    crash_address_ = crash_addr;
  49    }
  50
  51    int crash_signal() const { return crash_signal_; }
  52 -  void set_crash_signal(int crash_signal) { crash_signal_ = crash_signal; }
  53 +  void set_crash_signal(int crash_sig) { crash_signal_ = crash_sig; }
  54    const char* GetCrashSignalString() const;
  55
  56    void set_crash_signal_code(int code) { crash_signal_code_ = code; }
  57 @@ -196,7 +196,7 @@ class LinuxDumper {
  58    }
  59
  60    pid_t crash_thread() const { return crash_thread_; }
  61 -  void set_crash_thread(pid_t crash_thread) { crash_thread_ = crash_thread; }
  62 +  void set_crash_thread(pid_t thread) { crash_thread_ = thread; }
  63
  64    // Concatenates the |root_prefix_| and |mapping| path. Writes into |path| and
  65    // returns true unless the string is too long.