diff options
author | Chih-Hung Hsieh <chh@google.com> | 2018-08-13 14:22:56 -0700 |
---|---|---|
committer | Chih-Hung Hsieh <chh@google.com> | 2018-08-13 14:24:33 -0700 |
commit | 08d470bf08ce94f9e9860a7ba8ce2903502f093a (patch) | |
tree | a471de13c7a2fa9f776b1915dfbc0b2f44374bf2 /logd/LogBuffer.cpp | |
parent | 3b984c7efe00d72df699a439e422fe81178b9a58 (diff) | |
download | system_core-08d470bf08ce94f9e9860a7ba8ce2903502f093a.tar.gz system_core-08d470bf08ce94f9e9860a7ba8ce2903502f093a.tar.bz2 system_core-08d470bf08ce94f9e9860a7ba8ce2903502f093a.zip |
Replace (unsigned) short with (u)int16_t.
Bug: 112478838
Test: build with WITH_TIDY=1
Change-Id: I4b81e6287e72bce2d3cb67cacd6220d064818852
Diffstat (limited to 'logd/LogBuffer.cpp')
-rw-r--r-- | logd/LogBuffer.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/logd/LogBuffer.cpp b/logd/LogBuffer.cpp index 9b0436367..fd1b8b211 100644 --- a/logd/LogBuffer.cpp +++ b/logd/LogBuffer.cpp @@ -199,7 +199,7 @@ static enum match_type identical(LogBufferElement* elem, } int LogBuffer::log(log_id_t log_id, log_time realtime, uid_t uid, pid_t pid, - pid_t tid, const char* msg, unsigned short len) { + pid_t tid, const char* msg, uint16_t len) { if (log_id >= LOG_ID_MAX) { return -EINVAL; } @@ -240,7 +240,7 @@ int LogBuffer::log(log_id_t log_id, log_time realtime, uid_t uid, pid_t pid, LogBufferElement* currentLast = lastLoggedElements[log_id]; if (currentLast) { LogBufferElement* dropped = droppedElements[log_id]; - unsigned short count = dropped ? dropped->getDropped() : 0; + uint16_t count = dropped ? dropped->getDropped() : 0; // // State Init // incoming: @@ -584,13 +584,13 @@ class LogBufferElementLast { LogBufferElementMap map; public: - bool coalesce(LogBufferElement* element, unsigned short dropped) { + bool coalesce(LogBufferElement* element, uint16_t dropped) { LogBufferElementKey key(element->getUid(), element->getPid(), element->getTid()); LogBufferElementMap::iterator it = map.find(key.getKey()); if (it != map.end()) { LogBufferElement* found = it->second; - unsigned short moreDropped = found->getDropped(); + uint16_t moreDropped = found->getDropped(); if ((dropped + moreDropped) > USHRT_MAX) { map.erase(it); } else { @@ -847,7 +847,7 @@ bool LogBuffer::prune(log_id_t id, unsigned long pruneRows, uid_t caller_uid) { mLastSet[id] = true; } - unsigned short dropped = element->getDropped(); + uint16_t dropped = element->getDropped(); // remove any leading drops if (leading && dropped) { @@ -927,7 +927,7 @@ bool LogBuffer::prune(log_id_t id, unsigned long pruneRows, uid_t caller_uid) { kick = true; - unsigned short len = element->getMsgLen(); + uint16_t len = element->getMsgLen(); // do not create any leading drops if (leading) { |