ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 0c61a650: am 2e132ef6: Merge "Logd: Handle unused variable and fields"

Browse source 
* commit '0c61a650ce8638e6fd7bbbb1ef7ed42e75167194':
  Logd: Handle unused variable and fields
This commit is contained in:
Andreas Gampe 2015-07-28 00:17:05 +00:00 • committed by Android Git Automerger
commit ba6def6805
4 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
logd/CommandListener.cpp
View file

@ -34,8 +34,7 @@
CommandListener::CommandListener(LogBuffer *buf, LogReader * /*reader*/, CommandListener::CommandListener(LogBuffer *buf, LogReader * /*reader*/,
LogListener * /*swl*/) : LogListener * /*swl*/) :
FrameworkListener(getLogSocket()), FrameworkListener(getLogSocket()) {
mBuf(*buf) {
// registerCmd(new ShutdownCmd(buf, writer, swl)); // registerCmd(new ShutdownCmd(buf, writer, swl));
registerCmd(new ClearCmd(buf)); registerCmd(new ClearCmd(buf));
registerCmd(new GetBufSizeCmd(buf)); registerCmd(new GetBufSizeCmd(buf));
@ -47,10 +46,9 @@ CommandListener::CommandListener(LogBuffer *buf, LogReader * /*reader*/,
registerCmd(new ReinitCmd()); registerCmd(new ReinitCmd());
} }
CommandListener::ShutdownCmd::ShutdownCmd(LogBuffer *buf, LogReader *reader, CommandListener::ShutdownCmd::ShutdownCmd(LogReader *reader,
LogListener *swl) : LogListener *swl) :
LogCommand("shutdown"), LogCommand("shutdown"),
mBuf(*buf),
mReader(*reader), mReader(*reader),
mSwl(*swl) { mSwl(*swl) {
} }

4
logd/CommandListener.h
View file

@ -27,7 +27,6 @@
void reinit_signal_handler(int /*signal*/); void reinit_signal_handler(int /*signal*/);
class CommandListener : public FrameworkListener { class CommandListener : public FrameworkListener {
LogBuffer &mBuf;
public: public:
CommandListener(LogBuffer *buf, LogReader *reader, LogListener *swl); CommandListener(LogBuffer *buf, LogReader *reader, LogListener *swl);
@ -37,12 +36,11 @@ private:
static int getLogSocket(); static int getLogSocket();
class ShutdownCmd : public LogCommand { class ShutdownCmd : public LogCommand {
LogBuffer &mBuf;
LogReader &mReader; LogReader &mReader;
LogListener &mSwl; LogListener &mSwl;
public: public:
ShutdownCmd(LogBuffer *buf, LogReader *reader, LogListener *swl); ShutdownCmd(LogReader *reader, LogListener *swl);
virtual ~ShutdownCmd() {} virtual ~ShutdownCmd() {}
int runCommand(SocketClient *c, int argc, char ** argv); int runCommand(SocketClient *c, int argc, char ** argv);
}; };

3
logd/LogKlog.cpp
View file

@ -177,8 +177,6 @@ LogKlog::LogKlog(LogBuffer *buf, LogReader *reader, int fdWrite, int fdRead, boo
logbuf(buf), logbuf(buf),
reader(reader), reader(reader),
signature(CLOCK_MONOTONIC), signature(CLOCK_MONOTONIC),
fdWrite(fdWrite),
fdRead(fdRead),
initialized(false), initialized(false),
enableLogging(true), enableLogging(true),
auditd(auditd) { auditd(auditd) {
@ -492,7 +490,6 @@ int LogKlog::log(const char *buf) {
} }
} }
} else if (isspace(cp[size])) { } else if (isspace(cp[size])) {
const char *b = cp;
cp += size; cp += size;
while (isspace(*++cp)); while (isspace(*++cp));
// <PRI>[<TIME>] <tag> <tag> : message // <PRI>[<TIME>] <tag> <tag> : message

2
logd/LogKlog.h
View file

@ -27,8 +27,6 @@ class LogKlog : public SocketListener {
LogBuffer *logbuf; LogBuffer *logbuf;
LogReader *reader; LogReader *reader;
const log_time signature; const log_time signature;
const int fdWrite; // /dev/kmsg
const int fdRead; // /proc/kmsg
// Set once thread is started, separates KLOG_ACTION_READ_ALL // Set once thread is started, separates KLOG_ACTION_READ_ALL
// and KLOG_ACTION_READ phases. // and KLOG_ACTION_READ phases.
bool initialized; bool initialized;