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

Merge "liblog: deal with warning messages"

Browse source 
am: 806bb17e76

* commit '806bb17e76d015f6192c50f20a0101573214948a':
  liblog: deal with warning messages
This commit is contained in:
Mark Salyzyn 2016-02-22 23:48:45 +00:00 • committed by android-build-merger
commit cc2bff64fe
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) if (numLines > MAX_LINES)
numLines = MAX_LINES; numLines = MAX_LINES;
numVecs = numLines*3; // 3 iovecs per line. numVecs = numLines * 3; // 3 iovecs per line.
if (numVecs > INLINE_VECS) { if (numVecs > INLINE_VECS) {
vec = (struct iovec*)malloc(sizeof(struct iovec)*numVecs); vec = (struct iovec*)malloc(sizeof(struct iovec)*numVecs);
if (vec == NULL) { if (vec == NULL) {
msg = "LOG: write failed, no memory"; msg = "LOG: write failed, no memory";
numVecs = 3; numVecs = INLINE_VECS;
numLines = 1; numLines = numVecs / 3;
vec = stackVec; 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) { if (logger_list->pid) {
n = snprintf(cp, remaining, " pid=%u", logger_list->pid); snprintf(cp, remaining, " pid=%u", logger_list->pid);
n = min(n, remaining);
remaining -= n;
cp += n;
} }
return send_log_msg(NULL, NULL, buf, len); 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; preread_count = 0;
} }
ret = 0;
while(1) { while(1) {
if (preread_count < sizeof(buf)) { if (preread_count < sizeof(buf)) {
ret = TEMP_FAILURE_RETRY(read(logger_list->sock, 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) { if (logger_list->pid) {
ret = snprintf(cp, remaining, " pid=%u", logger_list->pid); ret = snprintf(cp, remaining, " pid=%u", logger_list->pid);
ret = min(ret, remaining); ret = min(ret, remaining);
remaining -= ret;
cp += ret; cp += ret;
} }
@ -867,7 +862,6 @@ int android_logger_list_read(struct logger_list *logger_list,
logger_list->sock = sock; logger_list->sock = sock;
} }
ret = 0;
while(1) { while(1) {
memset(log_msg, 0, sizeof(*log_msg)); memset(log_msg, 0, sizeof(*log_msg));