tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am b51e3dbd: am 6e9798f2: Merge "logd: fix format-extra-args warning."

Browse source 
* commit 'b51e3dbdd8d95f595c70dd244b5f2f4f23ef20cd':
  logd: fix format-extra-args warning.
This commit is contained in:
Chih-Hung Hsieh 2014-09-13 00:42:14 +00:00 committed by Android Git Automerger
commit bb7f515ad3
3 changed files with 28 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
logd/LogStatistics.cpp
View file

@ -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();

13
logd/LogWhiteBlackList.cpp
View file

@ -39,10 +39,15 @@ int Prune::cmp(uid_t uid, pid_t pid) const {
void Prune::format(char **strp) {
if (mUid != uid_all) {
asprintf(strp, (mPid != pid_all) ? "%u/%u" : "%u", mUid, mPid);
} else {
// NB: mPid == pid_all can not happen if mUid == uid_all
asprintf(strp, (mPid != pid_all) ? "/%u" : "/", mPid);
if (mPid != pid_all) {
asprintf(strp, "%u/%u", mUid, mPid);
} else {
asprintf(strp, "%u", mUid);
}
} else if (mPid != pid_all) {
asprintf(strp, "/%u", mPid);
} else { // NB: mPid == pid_all can not happen if mUid == uid_all
asprintf(strp, "/");
}
}

6
logd/tests/logd_test.cpp
View file

@ -417,7 +417,11 @@ static void dump_log_msg(const char *prefix,
if (((p - cp) > 3) && !*p && ((unsigned int)(p - cp) < len)) {
fprintf(stderr, "\"");
while (*cp) {
fprintf(stderr, (*cp != '\n') ? "%c" : "\\n", *cp);
if (*cp != '\n') {
fprintf(stderr, "%c", *cp);
} else {
fprintf(stderr, "\\n");
}
++cp;
--len;
}