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

Commit 77187787 authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

logd: Cleanup 

- Android Coding Standard for Constructors
- Side effects NONE

Change-Id: I2cda9dd73f3ac3ab58f394015cb810820093d47b
parent e1f2004e

logd/CommandListener.cpp

+39 −40
Original line number Diff line number Diff line
@@ -33,9 +33,9 @@ 
#include "LogCommand.h"



CommandListener::CommandListener(LogBuffer *buf, LogReader * /*reader*/,

                                 LogListener * /*swl*/)

        : FrameworkListener(getLogSocket())

        , mBuf(*buf) {

                                 LogListener * /*swl*/) :

        FrameworkListener(getLogSocket()),

        mBuf(*buf) {

    // registerCmd(new ShutdownCmd(buf, writer, swl));

    registerCmd(new ClearCmd(buf));

    registerCmd(new GetBufSizeCmd(buf));
@@ -48,12 +48,12 @@ CommandListener::CommandListener(LogBuffer *buf, LogReader * /*reader*/, 
}



CommandListener::ShutdownCmd::ShutdownCmd(LogBuffer *buf, LogReader *reader,

                                          LogListener *swl)

        : LogCommand("shutdown")

        , mBuf(*buf)

        , mReader(*reader)

        , mSwl(*swl)

{ }

                                          LogListener *swl) :

        LogCommand("shutdown"),

        mBuf(*buf),

        mReader(*reader),

        mSwl(*swl) {

}



int CommandListener::ShutdownCmd::runCommand(SocketClient * /*cli*/,

                                             int /*argc*/,
@@ -63,10 +63,10 @@ int CommandListener::ShutdownCmd::runCommand(SocketClient * /*cli*/, 
    exit(0);

}



CommandListener::ClearCmd::ClearCmd(LogBuffer *buf)

        : LogCommand("clear")

        , mBuf(*buf)

{ }

CommandListener::ClearCmd::ClearCmd(LogBuffer *buf) :

        LogCommand("clear"),

        mBuf(*buf) {

}



static void setname() {

    static bool name_set;
@@ -100,10 +100,10 @@ int CommandListener::ClearCmd::runCommand(SocketClient *cli, 
    return 0;

}



CommandListener::GetBufSizeCmd::GetBufSizeCmd(LogBuffer *buf)

        : LogCommand("getLogSize")

        , mBuf(*buf)

{ }

CommandListener::GetBufSizeCmd::GetBufSizeCmd(LogBuffer *buf) :

        LogCommand("getLogSize"),

        mBuf(*buf) {

}



int CommandListener::GetBufSizeCmd::runCommand(SocketClient *cli,

                                         int argc, char **argv) {
@@ -126,10 +126,10 @@ int CommandListener::GetBufSizeCmd::runCommand(SocketClient *cli, 
    return 0;

}



CommandListener::SetBufSizeCmd::SetBufSizeCmd(LogBuffer *buf)

        : LogCommand("setLogSize")

        , mBuf(*buf)

{ }

CommandListener::SetBufSizeCmd::SetBufSizeCmd(LogBuffer *buf) :

        LogCommand("setLogSize"),

        mBuf(*buf) {

}



int CommandListener::SetBufSizeCmd::runCommand(SocketClient *cli,

                                         int argc, char **argv) {
@@ -160,10 +160,10 @@ int CommandListener::SetBufSizeCmd::runCommand(SocketClient *cli, 
    return 0;

}



CommandListener::GetBufSizeUsedCmd::GetBufSizeUsedCmd(LogBuffer *buf)

        : LogCommand("getLogSizeUsed")

        , mBuf(*buf)

{ }

CommandListener::GetBufSizeUsedCmd::GetBufSizeUsedCmd(LogBuffer *buf) :

        LogCommand("getLogSizeUsed"),

        mBuf(*buf) {

}



int CommandListener::GetBufSizeUsedCmd::runCommand(SocketClient *cli,

                                         int argc, char **argv) {
@@ -186,10 +186,10 @@ int CommandListener::GetBufSizeUsedCmd::runCommand(SocketClient *cli, 
    return 0;

}



CommandListener::GetStatisticsCmd::GetStatisticsCmd(LogBuffer *buf)

        : LogCommand("getStatistics")

        , mBuf(*buf)

{ }

CommandListener::GetStatisticsCmd::GetStatisticsCmd(LogBuffer *buf) :

        LogCommand("getStatistics"),

        mBuf(*buf) {

}



static void package_string(char **strp) {

    const char *a = *strp;
@@ -243,10 +243,10 @@ int CommandListener::GetStatisticsCmd::runCommand(SocketClient *cli, 
    return 0;

}



CommandListener::GetPruneListCmd::GetPruneListCmd(LogBuffer *buf)

        : LogCommand("getPruneList")

        , mBuf(*buf)

{ }

CommandListener::GetPruneListCmd::GetPruneListCmd(LogBuffer *buf) :

        LogCommand("getPruneList"),

        mBuf(*buf) {

}



int CommandListener::GetPruneListCmd::runCommand(SocketClient *cli,

                                         int /*argc*/, char ** /*argv*/) {
@@ -263,10 +263,10 @@ int CommandListener::GetPruneListCmd::runCommand(SocketClient *cli, 
    return 0;

}



CommandListener::SetPruneListCmd::SetPruneListCmd(LogBuffer *buf)

        : LogCommand("setPruneList")

        , mBuf(*buf)

{ }

CommandListener::SetPruneListCmd::SetPruneListCmd(LogBuffer *buf) :

        LogCommand("setPruneList"),

        mBuf(*buf) {

}



int CommandListener::SetPruneListCmd::runCommand(SocketClient *cli,

                                         int argc, char **argv) {
@@ -301,9 +301,8 @@ int CommandListener::SetPruneListCmd::runCommand(SocketClient *cli, 
    return 0;

}



CommandListener::ReinitCmd::ReinitCmd()

        : LogCommand("reinit")

{ }

CommandListener::ReinitCmd::ReinitCmd() : LogCommand("reinit") {

}



int CommandListener::ReinitCmd::runCommand(SocketClient *cli,

                                         int /*argc*/, char ** /*argv*/) {

logd/FlushCommand.cpp

+8 −8
Original line number Diff line number Diff line
@@ -27,14 +27,14 @@ FlushCommand::FlushCommand(LogReader &reader, 
                           unsigned long tail,

                           unsigned int logMask,

                           pid_t pid,

                           uint64_t start)

        : mReader(reader)

        , mNonBlock(nonBlock)

        , mTail(tail)

        , mLogMask(logMask)

        , mPid(pid)

        , mStart(start)

{ }

                           uint64_t start) :

        mReader(reader),

        mNonBlock(nonBlock),

        mTail(tail),

        mLogMask(logMask),

        mPid(pid),

        mStart(start) {

}



// runSocketCommand is called once for every open client on the

// log reader socket. Here we manage and associated the reader

logd/LogAudit.cpp

+6 −6
Original line number Diff line number Diff line
@@ -37,12 +37,12 @@ 
    '0' + LOG_MAKEPRI(LOG_AUTH, LOG_PRI(PRI)) % 10, \

    '>'



LogAudit::LogAudit(LogBuffer *buf, LogReader *reader, int fdDmesg)

        : SocketListener(getLogSocket(), false)

        , logbuf(buf)

        , reader(reader)

        , fdDmesg(fdDmesg)

        , initialized(false) {

LogAudit::LogAudit(LogBuffer *buf, LogReader *reader, int fdDmesg) :

        SocketListener(getLogSocket(), false),

        logbuf(buf),

        reader(reader),

        fdDmesg(fdDmesg),

        initialized(false) {

    static const char auditd_message[] = { KMSG_PRIORITY(LOG_INFO),

        'l', 'o', 'g', 'd', '.', 'a', 'u', 'd', 'i', 't', 'd', ':',

        ' ', 's', 't', 'a', 'r', 't', '\n' };

logd/LogBuffer.cpp

+1 −2
Original line number Diff line number Diff line
@@ -126,8 +126,7 @@ void LogBuffer::init() { 
    }

}



LogBuffer::LogBuffer(LastLogTimes *times)

        : mTimes(*times) {

LogBuffer::LogBuffer(LastLogTimes *times) : mTimes(*times) {

    pthread_mutex_init(&mLogElementsLock, NULL);



    init();

logd/LogBufferElement.cpp

+8 −8
Original line number Diff line number Diff line
@@ -34,14 +34,14 @@ atomic_int_fast64_t LogBufferElement::sequence; 


LogBufferElement::LogBufferElement(log_id_t log_id, log_time realtime,

                                   uid_t uid, pid_t pid, pid_t tid,

                                   const char *msg, unsigned short len)

        : mLogId(log_id)

        , mUid(uid)

        , mPid(pid)

        , mTid(tid)

        , mMsgLen(len)

        , mSequence(sequence.fetch_add(1, memory_order_relaxed))

        , mRealTime(realtime) {

                                   const char *msg, unsigned short len) :

        mLogId(log_id),

        mUid(uid),

        mPid(pid),

        mTid(tid),

        mMsgLen(len),

        mSequence(sequence.fetch_add(1, memory_order_relaxed)),

        mRealTime(realtime) {

    mMsg = new char[len];

    memcpy(mMsg, msg, len);

}