openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

logcat: remove dead label code 

Change-Id: I12d6aa4ebf48f06faf9435b4ffedfd309629cf3b
This commit is contained in:
Mark Salyzyn 2015-02-27 13:41:34 -08:00
parent 9421b0c060
commit 5f6738af48
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
logcat/logcat.cpp
View File

@ -38,14 +38,12 @@ struct log_device_t {
struct logger *logger;
struct logger_list *logger_list;
bool printed;
char label;
log_device_t* next;
log_device_t(const char* d, bool b, char l) {
log_device_t(const char* d, bool b) {
device = d;
binary = b;
label = l;
next = NULL;
printed = false;
}
@ -152,16 +150,6 @@ static void processBuffer(log_device_t* dev, struct log_msg *buf)
}
if (android_log_shouldPrintLine(g_logformat, entry.tag, entry.priority)) {
if (false && g_devCount > 1) {
binaryMsgBuf[0] = dev->label;
binaryMsgBuf[1] = ' ';
bytesWritten = write(g_outFD, binaryMsgBuf, 2);
if (bytesWritten < 0) {
perror("output error");
exit(-1);
}
}
bytesWritten = android_log_printLogLine(g_logformat, g_outFD, &entry);
if (bytesWritten < 0) {
@ -482,7 +470,7 @@ int main(int argc, char **argv)
}
bool binary = strcmp(name, "events") == 0;
log_device_t* d = new log_device_t(name, binary, *name);
log_device_t* d = new log_device_t(name, binary);
if (dev) {
dev->next = d;
@ -502,9 +490,9 @@ int main(int argc, char **argv)
while (dev->next) {
dev = dev->next;
}
dev->next = new log_device_t(optarg, binary, optarg[0]);
dev->next = new log_device_t(optarg, binary);
} else {
devices = new log_device_t(optarg, binary, optarg[0]);
devices = new log_device_t(optarg, binary);
}
android::g_devCount++;
}
@ -638,14 +626,14 @@ int main(int argc, char **argv)
}
if (!devices) {
dev = devices = new log_device_t("main", false, 'm');
dev = devices = new log_device_t("main", false);
android::g_devCount = 1;
if (android_name_to_log_id("system") == LOG_ID_SYSTEM) {
dev = dev->next = new log_device_t("system", false, 's');
dev = dev->next = new log_device_t("system", false);
android::g_devCount++;
}
if (android_name_to_log_id("crash") == LOG_ID_CRASH) {
dev = dev->next = new log_device_t("crash", false, 'c');
dev = dev->next = new log_device_t("crash", false);
android::g_devCount++;
}
}
@ -846,7 +834,7 @@ int main(int argc, char **argv)
//LOG_EVENT_STRING(0, "whassup, doc?");
dev = NULL;
log_device_t unexpected("unexpected", false, '?');
log_device_t unexpected("unexpected", false);
while (1) {
struct log_msg log_msg;
log_device_t* d;