diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2014-09-13 00:15:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-13 00:15:30 +0000 |
| commit | 6e9798f2e44c82b0cd8257f96b7d23285a7edc67 (patch) | |
| tree | b28d7d60199cd2b20272a30c51fddec49d0bc5de /logd/LogStatistics.cpp | |
| parent | f41ee3d5a1f236b0770d1ebd7068606aea7288bd (diff) | |
| parent | 634118e261d2a3c6f67212f43a4ec3f075d705b6 (diff) | |
| download | system_core-6e9798f2e44c82b0cd8257f96b7d23285a7edc67.zip system_core-6e9798f2e44c82b0cd8257f96b7d23285a7edc67.tar.gz system_core-6e9798f2e44c82b0cd8257f96b7d23285a7edc67.tar.bz2 | |
Merge "logd: fix format-extra-args warning."
Diffstat (limited to 'logd/LogStatistics.cpp')
| -rw-r--r-- | logd/LogStatistics.cpp | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/logd/LogStatistics.cpp b/logd/LogStatistics.cpp index a2f27c6..82f9165 100644 --- a/logd/LogStatistics.cpp +++ b/logd/LogStatistics.cpp @@ -671,8 +671,11 @@ void LogStatistics::format(char **buf, size_t sizesTotal = p->sizesTotal(); android::String8 sz(""); - sz.appendFormat((sizes != sizesTotal) ? "%zu/%zu" : "%zu", - sizes, sizesTotal); + if (sizes == sizesTotal) { + sz.appendFormat("%zu", sizes); + } else { + sz.appendFormat("%zu/%zu", sizes, sizesTotal); + } android::String8 pd(""); pd.appendFormat("%u%c", pid, p->pidGone() ? '?' : ' '); @@ -783,12 +786,15 @@ void LogStatistics::format(char **buf, PidStatistics *pp = *pt; pid_t p = pp->getPid(); - intermediate = string.format(oneline - ? ((p == PidStatistics::gone) - ? "%d/?" - : "%d/%d%c") - : "%d", - u, p, pp->pidGone() ? '?' : '\0'); + if (!oneline) { + intermediate = string.format("%d", u); + } else if (p == PidStatistics::gone) { + intermediate = string.format("%d/?", u); + } else if (pp->pidGone()) { + intermediate = string.format("%d/%d?", u, p); + } else { + intermediate = string.format("%d/%d", u, p); + } string.appendFormat(first ? "\n%-12s" : "%-12s", intermediate.string()); intermediate.clear(); |