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

Commit 2e132ef6 authored by Andreas Gampe's avatar Andreas Gampe Committed by Gerrit Code Review
Browse files

Merge "Logd: Handle unused variable and fields"

parents 5f3b05ad d75564f9

logd/CommandListener.cpp

+2 −4
Original line number Diff line number Diff line
@@ -34,8 +34,7 @@ 


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

                                 LogListener * /*swl*/) :

        FrameworkListener(getLogSocket()),

        mBuf(*buf) {

        FrameworkListener(getLogSocket()) {

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

    registerCmd(new ClearCmd(buf));

    registerCmd(new GetBufSizeCmd(buf));
@@ -47,10 +46,9 @@ CommandListener::CommandListener(LogBuffer *buf, LogReader * /*reader*/, 
    registerCmd(new ReinitCmd());

}



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

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

                                          LogListener *swl) :

        LogCommand("shutdown"),

        mBuf(*buf),

        mReader(*reader),

        mSwl(*swl) {

}

logd/CommandListener.h

+1 −3
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
void reinit_signal_handler(int /*signal*/);



class CommandListener : public FrameworkListener {

    LogBuffer &mBuf;



public:

    CommandListener(LogBuffer *buf, LogReader *reader, LogListener *swl);
@@ -37,12 +36,11 @@ private: 
    static int getLogSocket();



    class ShutdownCmd : public LogCommand {

        LogBuffer &mBuf;

        LogReader &mReader;

        LogListener &mSwl;



    public:

        ShutdownCmd(LogBuffer *buf, LogReader *reader, LogListener *swl);

        ShutdownCmd(LogReader *reader, LogListener *swl);

        virtual ~ShutdownCmd() {}

        int runCommand(SocketClient *c, int argc, char ** argv);

    };

logd/LogKlog.cpp

+0 −3
Original line number Diff line number Diff line
@@ -177,8 +177,6 @@ LogKlog::LogKlog(LogBuffer *buf, LogReader *reader, int fdWrite, int fdRead, boo 
        logbuf(buf),

        reader(reader),

        signature(CLOCK_MONOTONIC),

        fdWrite(fdWrite),

        fdRead(fdRead),

        initialized(false),

        enableLogging(true),

        auditd(auditd) {
@@ -492,7 +490,6 @@ int LogKlog::log(const char *buf) { 
                    }

                }

            } else if (isspace(cp[size])) {

                const char *b = cp;

                cp += size;

                while (isspace(*++cp));

                // <PRI>[<TIME>] <tag> <tag> : message

logd/LogKlog.h

+0 −2
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ class LogKlog : public SocketListener { 
    LogBuffer *logbuf;

    LogReader *reader;

    const log_time signature;

    const int fdWrite; // /dev/kmsg

    const int fdRead;  // /proc/kmsg

    // Set once thread is started, separates KLOG_ACTION_READ_ALL

    // and KLOG_ACTION_READ phases.

    bool initialized;