From 5c721ea711b8c02e97014c0c5f78ff454c8dcf74 Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Tue, 2 Jul 2019 03:19:56 +0300 Subject: [PATCH] Style --- libs/libdaemon/src/BaseDaemon.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/libdaemon/src/BaseDaemon.cpp b/libs/libdaemon/src/BaseDaemon.cpp index 836d8454c77..04a211b8f2c 100644 --- a/libs/libdaemon/src/BaseDaemon.cpp +++ b/libs/libdaemon/src/BaseDaemon.cpp @@ -154,12 +154,12 @@ static void faultSignalHandler(int sig, siginfo_t * info, void * context) DB::WriteBufferFromFileDescriptor out(signal_pipe.write_fd, buf_size, buf); const ucontext_t signal_context = *reinterpret_cast(context); - const StackTrace stackTrace(signal_context); + const StackTrace stack_trace(signal_context); DB::writeBinary(sig, out); DB::writePODBinary(*info, out); DB::writePODBinary(signal_context, out); - DB::writePODBinary(stackTrace, out); + DB::writePODBinary(stack_trace, out); DB::writeBinary(getThreadNumber(), out); out.next(); @@ -232,15 +232,15 @@ public: { siginfo_t info; ucontext_t context; - StackTrace stackTrace(NoCapture{}); + StackTrace stack_trace(NoCapture{}); ThreadNumber thread_num; DB::readPODBinary(info, in); DB::readPODBinary(context, in); - DB::readPODBinary(stackTrace, in); + DB::readPODBinary(stack_trace, in); DB::readBinary(thread_num, in); - onFault(sig, info, context, stackTrace, thread_num); + onFault(sig, info, context, stack_trace, thread_num); } } } @@ -255,14 +255,14 @@ private: LOG_ERROR(log, "(version " << VERSION_STRING << VERSION_OFFICIAL << ") (from thread " << thread_num << ") " << message); } - void onFault(int sig, siginfo_t & info, ucontext_t & context, const StackTrace & stackTrace, ThreadNumber thread_num) const + void onFault(int sig, siginfo_t & info, ucontext_t & context, const StackTrace & stack_trace, ThreadNumber thread_num) const { LOG_ERROR(log, "########################################"); LOG_ERROR(log, "(version " << VERSION_STRING << VERSION_OFFICIAL << ") (from thread " << thread_num << ") " << "Received signal " << strsignal(sig) << " (" << sig << ")" << "."); LOG_ERROR(log, signalToErrorMessage(sig, info, context)); - LOG_ERROR(log, stackTrace.toString()); + LOG_ERROR(log, stack_trace.toString()); } };