logd: specify clang format
Switch _all_ file's coding style to match to ease all future changes.
SideEffects: None
Test: compile
Bug: 35373582
Change-Id: I470cb17f64fa48f14aafc02f574e296bffe3a3f3
diff --git a/logd/LogBufferElement.cpp b/logd/LogBufferElement.cpp
index a651fd4..5ba3a15 100644
--- a/logd/LogBufferElement.cpp
+++ b/logd/LogBufferElement.cpp
@@ -35,41 +35,41 @@
LogBufferElement::LogBufferElement(log_id_t log_id, log_time realtime,
uid_t uid, pid_t pid, pid_t tid,
- const char *msg, unsigned short len) :
- mUid(uid),
- mPid(pid),
- mTid(tid),
- mSequence(sequence.fetch_add(1, memory_order_relaxed)),
- mRealTime(realtime),
- mMsgLen(len),
- mLogId(log_id) {
+ const char* msg, unsigned short len)
+ : mUid(uid),
+ mPid(pid),
+ mTid(tid),
+ mSequence(sequence.fetch_add(1, memory_order_relaxed)),
+ mRealTime(realtime),
+ mMsgLen(len),
+ mLogId(log_id) {
mMsg = new char[len];
memcpy(mMsg, msg, len);
- mTag = (isBinary() && (mMsgLen >= sizeof(uint32_t))) ?
- le32toh(reinterpret_cast<android_event_header_t *>(mMsg)->tag) :
- 0;
+ mTag = (isBinary() && (mMsgLen >= sizeof(uint32_t)))
+ ? le32toh(reinterpret_cast<android_event_header_t*>(mMsg)->tag)
+ : 0;
}
-LogBufferElement::LogBufferElement(const LogBufferElement &elem) :
- mTag(elem.mTag),
- mUid(elem.mUid),
- mPid(elem.mPid),
- mTid(elem.mTid),
- mSequence(elem.mSequence),
- mRealTime(elem.mRealTime),
- mMsgLen(elem.mMsgLen),
- mLogId(elem.mLogId) {
+LogBufferElement::LogBufferElement(const LogBufferElement& elem)
+ : mTag(elem.mTag),
+ mUid(elem.mUid),
+ mPid(elem.mPid),
+ mTid(elem.mTid),
+ mSequence(elem.mSequence),
+ mRealTime(elem.mRealTime),
+ mMsgLen(elem.mMsgLen),
+ mLogId(elem.mLogId) {
mMsg = new char[mMsgLen];
memcpy(mMsg, elem.mMsg, mMsgLen);
}
LogBufferElement::~LogBufferElement() {
- delete [] mMsg;
+ delete[] mMsg;
}
// caller must own and free character string
-char *android::tidToName(pid_t tid) {
- char *retval = NULL;
+char* android::tidToName(pid_t tid) {
+ char* retval = NULL;
char buffer[256];
snprintf(buffer, sizeof(buffer), "/proc/%u/comm", tid);
int fd = open(buffer, O_RDONLY);
@@ -89,7 +89,7 @@
}
// if nothing for comm, check out cmdline
- char *name = android::pidToName(tid);
+ char* name = android::pidToName(tid);
if (!retval) {
retval = name;
name = NULL;
@@ -101,8 +101,8 @@
size_t retval_len = strlen(retval);
size_t name_len = strlen(name);
// KISS: ToDo: Only checks prefix truncated, not suffix, or both
- if ((retval_len < name_len)
- && !fastcmp<strcmp>(retval, name + name_len - retval_len)) {
+ if ((retval_len < name_len) &&
+ !fastcmp<strcmp>(retval, name + name_len - retval_len)) {
free(retval);
retval = name;
} else {
@@ -113,21 +113,20 @@
}
// assumption: mMsg == NULL
-size_t LogBufferElement::populateDroppedMessage(char*& buffer,
- LogBuffer* parent, bool lastSame) {
+size_t LogBufferElement::populateDroppedMessage(char*& buffer, LogBuffer* parent,
+ bool lastSame) {
static const char tag[] = "chatty";
- if (!__android_log_is_loggable_len(ANDROID_LOG_INFO,
- tag, strlen(tag),
+ if (!__android_log_is_loggable_len(ANDROID_LOG_INFO, tag, strlen(tag),
ANDROID_LOG_VERBOSE)) {
return 0;
}
static const char format_uid[] = "uid=%u%s%s %s %u line%s";
parent->lock();
- const char *name = parent->uidToName(mUid);
+ const char* name = parent->uidToName(mUid);
parent->unlock();
- const char *commName = android::tidToName(mTid);
+ const char* commName = android::tidToName(mTid);
if (!commName && (mTid != mPid)) {
commName = android::tidToName(mPid);
}
@@ -140,35 +139,35 @@
size_t len = strlen(name + 1);
if (!strncmp(name + 1, commName + 1, len)) {
if (commName[len + 1] == '\0') {
- free(const_cast<char *>(commName));
+ free(const_cast<char*>(commName));
commName = NULL;
} else {
- free(const_cast<char *>(name));
+ free(const_cast<char*>(name));
name = NULL;
}
}
}
if (name) {
- char *buf = NULL;
+ char* buf = NULL;
asprintf(&buf, "(%s)", name);
if (buf) {
- free(const_cast<char *>(name));
+ free(const_cast<char*>(name));
name = buf;
}
}
if (commName) {
- char *buf = NULL;
+ char* buf = NULL;
asprintf(&buf, " %s", commName);
if (buf) {
- free(const_cast<char *>(commName));
+ free(const_cast<char*>(commName));
commName = buf;
}
}
// identical to below to calculate the buffer size required
const char* type = lastSame ? "identical" : "expire";
size_t len = snprintf(NULL, 0, format_uid, mUid, name ? name : "",
- commName ? commName : "", type,
- mDropped, (mDropped > 1) ? "s" : "");
+ commName ? commName : "", type, mDropped,
+ (mDropped > 1) ? "s" : "");
size_t hdrLen;
if (isBinary()) {
@@ -177,17 +176,17 @@
hdrLen = 1 + sizeof(tag);
}
- buffer = static_cast<char *>(calloc(1, hdrLen + len + 1));
+ buffer = static_cast<char*>(calloc(1, hdrLen + len + 1));
if (!buffer) {
- free(const_cast<char *>(name));
- free(const_cast<char *>(commName));
+ free(const_cast<char*>(name));
+ free(const_cast<char*>(commName));
return 0;
}
size_t retval = hdrLen + len;
if (isBinary()) {
- android_log_event_string_t *event =
- reinterpret_cast<android_log_event_string_t *>(buffer);
+ android_log_event_string_t* event =
+ reinterpret_cast<android_log_event_string_t*>(buffer);
event->header.tag = htole32(CHATTY_LOG_TAG);
event->type = EVENT_TYPE_STRING;
@@ -199,10 +198,10 @@
}
snprintf(buffer + hdrLen, len + 1, format_uid, mUid, name ? name : "",
- commName ? commName : "", type,
- mDropped, (mDropped > 1) ? "s" : "");
- free(const_cast<char *>(name));
- free(const_cast<char *>(commName));
+ commName ? commName : "", type, mDropped,
+ (mDropped > 1) ? "s" : "");
+ free(const_cast<char*>(name));
+ free(const_cast<char*>(commName));
return retval;
}
@@ -213,9 +212,8 @@
memset(&entry, 0, sizeof(struct logger_entry_v4));
- entry.hdr_size = privileged ?
- sizeof(struct logger_entry_v4) :
- sizeof(struct logger_entry_v3);
+ entry.hdr_size = privileged ? sizeof(struct logger_entry_v4)
+ : sizeof(struct logger_entry_v3);
entry.lid = mLogId;
entry.pid = mPid;
entry.tid = mTid;
@@ -227,13 +225,11 @@
iovec[0].iov_base = &entry;
iovec[0].iov_len = entry.hdr_size;
- char *buffer = NULL;
+ char* buffer = NULL;
if (!mMsg) {
entry.len = populateDroppedMessage(buffer, parent, lastSame);
- if (!entry.len) {
- return mSequence;
- }
+ if (!entry.len) return mSequence;
iovec[1].iov_base = buffer;
} else {
entry.len = mMsgLen;
@@ -243,9 +239,7 @@
uint64_t retval = reader->sendDatav(iovec, 2) ? FLUSH_ERROR : mSequence;
- if (buffer) {
- free(buffer);
- }
+ if (buffer) free(buffer);
return retval;
}