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

liblog: deal with warning messages

Browse source 
- Fix bug in fake_log_devices when it can not allocate memory
  failing to use the full on-stack buffer as backup.
- remove superfluous code.

Bug: 27265662
Change-Id: I97b6cca5f4ce8ecad9beb3a08353de596d6a4ad1
This commit is contained in:
Mark Salyzyn 2016-02-19 13:08:59 -08:00
parent ee127f3d6b
commit b525884edb
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
liblog/fake_log_device.c
View file

@ -469,13 +469,13 @@ static void showLog(LogState *state,
if (numLines > MAX_LINES)
numLines = MAX_LINES;
numVecs = numLines*3; // 3 iovecs per line.
numVecs = numLines * 3; // 3 iovecs per line.
if (numVecs > INLINE_VECS) {
vec = (struct iovec*)malloc(sizeof(struct iovec)*numVecs);
if (vec == NULL) {
msg = "LOG: write failed, no memory";
numVecs = 3;
numLines = 1;
numVecs = INLINE_VECS;
numLines = numVecs / 3;
vec = stackVec;
}
}

8
liblog/log_read.c
View file

@ -503,10 +503,7 @@ ssize_t android_logger_get_statistics(struct logger_list *logger_list,
}
if (logger_list->pid) {
n = snprintf(cp, remaining, " pid=%u", logger_list->pid);
n = min(n, remaining);
remaining -= n;
cp += n;
snprintf(cp, remaining, " pid=%u", logger_list->pid);
}
return send_log_msg(NULL, NULL, buf, len);
@ -657,7 +654,6 @@ static int android_logger_list_read_pstore(struct logger_list *logger_list,
preread_count = 0;
}
ret = 0;
while(1) {
if (preread_count < sizeof(buf)) {
ret = TEMP_FAILURE_RETRY(read(logger_list->sock,
@ -834,7 +830,6 @@ int android_logger_list_read(struct logger_list *logger_list,
if (logger_list->pid) {
ret = snprintf(cp, remaining, " pid=%u", logger_list->pid);
ret = min(ret, remaining);
remaining -= ret;
cp += ret;
}
@ -867,7 +862,6 @@ int android_logger_list_read(struct logger_list *logger_list,
logger_list->sock = sock;
}
ret = 0;
while(1) {
memset(log_msg, 0, sizeof(*log_msg));