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

Commit d95410d4 authored by Christopher Ferris's avatar Christopher Ferris Committed by Gerrit Code Review
Browse files

Merge "Fix setting of std::optional variables."

parents 2715bb6c e0b0617d

system/gd/facade/facade_main.cc

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ bool crash_callback(const void* crash_context, size_t crash_context_size, void* 
  std::optional<pid_t> tid;

  if (crash_context_size >= sizeof(google_breakpad::ExceptionHandler::CrashContext)) {

    auto* ctx = static_cast<const google_breakpad::ExceptionHandler::CrashContext*>(crash_context);

    *tid = ctx->tid;

    tid = ctx->tid;

    int signal_number = ctx->siginfo.si_signo;

    LOG_ERROR("Process crashed, signal: %s[%d], tid: %d", strsignal(signal_number), signal_number, ctx->tid);

  } else {

tools/rootcanal/desktop/root_canal_main.cc

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ bool crash_callback(const void* crash_context, size_t crash_context_size, 
    auto* ctx =

        static_cast<const google_breakpad::ExceptionHandler::CrashContext*>(

            crash_context);

    *tid = ctx->tid;

    tid = ctx->tid;

    int signal_number = ctx->siginfo.si_signo;

    LOG_ERROR("Process crashed, signal: %s[%d], tid: %d",

              strsignal(signal_number), signal_number, ctx->tid);