pa-fazil
/
android_system_core
mirror of https://github.com/fazilsheik96/android_system_core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

liblog: remove superfluous checks 

More checks in static functions where all callers always satisfy them.

Test: build
Change-Id: I3c9bd1fd4e5c55a2f9f2c42d5259c5cdd8f8a853
This commit is contained in:
Tom Cherry 2019-10-02 10:34:03 -07:00
parent 97ec4eecd4
commit 990852ff7d
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
liblog/fake_writer.cpp
View File

@ -24,6 +24,7 @@
#include "log_portability.h"
#include "logger.h"
static int fakeAvailable(log_id_t);
static int fakeOpen();
static void fakeClose();
static int fakeWrite(log_id_t log_id, struct timespec* ts, struct iovec* vec, size_t nr);
@ -34,12 +35,16 @@ struct android_log_transport_write fakeLoggerWrite = {
.name = "fake",
.logMask = 0,
.context.priv = &logFds,
.available = NULL,
.available = fakeAvailable,
.open = fakeOpen,
.close = fakeClose,
.write = fakeWrite,
};
static int fakeAvailable(log_id_t) {
return 0;
}
static int fakeOpen() {
int i;

19
liblog/logger_write.cpp
View File

@ -100,9 +100,8 @@ static void __android_log_cache_available(struct android_log_transport_write* no
}
for (i = LOG_ID_MIN; i < LOG_ID_MAX; ++i) {
if (node->write && (i != LOG_ID_KERNEL) &&
((i != LOG_ID_SECURITY) || (check_log_uid_permissions() == 0)) &&
(!node->available || ((*node->available)(static_cast<log_id_t>(i)) >= 0))) {
if (i != LOG_ID_KERNEL && (i != LOG_ID_SECURITY || check_log_uid_permissions() == 0) &&
(*node->available)(static_cast<log_id_t>(i)) >= 0) {
node->logMask |= 1 << i;
}
}
@ -198,14 +197,6 @@ static int __write_to_log_initialize() {
static int __write_to_log_daemon(log_id_t log_id, struct iovec* vec, size_t nr) {
int ret, save_errno;
struct timespec ts;
size_t len, i;
for (len = i = 0; i < nr; ++i) {
len += vec[i].iov_len;
}
if (!len) {
return -EINVAL;
}
save_errno = errno;
#if defined(__ANDROID__)
@ -275,10 +266,6 @@ static int __write_to_log_daemon(log_id_t log_id, struct iovec* vec, size_t nr)
int prio = *static_cast<int*>(vec[0].iov_base);
const char* tag = static_cast<const char*>(vec[1].iov_base);
size_t len = vec[1].iov_len;
/* tag must be nul terminated */
if (strnlen(tag, len) >= len) {
tag = NULL;
}
if (!__android_log_is_loggable_len(prio, tag, len - 1, ANDROID_LOG_VERBOSE)) {
errno = save_errno;
@ -296,7 +283,7 @@ static int __write_to_log_daemon(log_id_t log_id, struct iovec* vec, size_t nr)
#endif
ret = 0;
i = 1 << log_id;
size_t i = 1 << log_id;
if (android_log_write != nullptr && (android_log_write->logMask & i)) {
ssize_t retval;