Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f78a4ea authored by Tom Cherry's avatar Tom Cherry Committed by Automerger Merge Worker
Browse files

Merge "logd: fix various clang-tidy issues" am: 4739f752 am: 7a5ae6dd am: f0ee440a 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1342013

Change-Id: Iddd4f79ff26d5a261bee00dec03c84713c51be73
parents 228a3945 f0ee440a

logd/LogBufferElement.cpp

+2 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ LogBufferElement::LogBufferElement(const LogBufferElement& elem) 
    }

}



LogBufferElement::LogBufferElement(LogBufferElement&& elem)

LogBufferElement::LogBufferElement(LogBufferElement&& elem) noexcept

    : uid_(elem.uid_),

      pid_(elem.pid_),

      tid_(elem.tid_),
@@ -134,7 +134,7 @@ char* android::tidToName(pid_t tid) { 
    char* retval = nullptr;

    char buffer[256];

    snprintf(buffer, sizeof(buffer), "/proc/%u/comm", tid);

    int fd = open(buffer, O_RDONLY);

    int fd = open(buffer, O_RDONLY | O_CLOEXEC);

    if (fd >= 0) {

        ssize_t ret = read(fd, buffer, sizeof(buffer));

        if (ret >= (ssize_t)sizeof(buffer)) {

logd/LogBufferElement.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ class __attribute__((packed)) LogBufferElement { 
    LogBufferElement(log_id_t log_id, log_time realtime, uid_t uid, pid_t pid, pid_t tid,

                     uint64_t sequence, const char* msg, uint16_t len);

    LogBufferElement(const LogBufferElement& elem);

    LogBufferElement(LogBufferElement&& elem);

    LogBufferElement(LogBufferElement&& elem) noexcept;

    ~LogBufferElement();



    uint32_t GetTag() const;

logd/LogListener.h

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 


class LogListener {

  public:

    LogListener(LogBuffer* buf);

    explicit LogListener(LogBuffer* buf);

    bool StartListener();



  private:

logd/LogPermissions.cpp

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ bool clientHasLogCredentials(uid_t uid, gid_t gid, pid_t pid) { 
    //

    for (int retry = 3; !(ret = foundGid && foundUid && foundLog) && retry;

         --retry) {

        FILE* file = fopen(filename, "r");

        FILE* file = fopen(filename, "re");

        if (!file) {

            continue;

        }

logd/LogReader.cpp

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ bool LogReader::onDataAvailable(SocketClient* cli) { 
    if (cp) {

        logMask = 0;

        cp += sizeof(_logIds) - 1;

        while (*cp && *cp != '\0') {

        while (*cp != '\0') {

            int val = 0;

            while (isdigit(*cp)) {

                val = val * 10 + *cp - '0';