commit 634118e261d2a3c6f67212f43a4ec3f075d705b6
author Chih-Hung Hsieh <chh@google.com> Fri Sep 12 16:02:28 2014 -0700
committer Mark Salyzyn <salyzyn@google.com> Fri Sep 12 23:37:42 2014 +0000
tree b28d7d60199cd2b20272a30c51fddec49d0bc5de
parent f41ee3d5a1f236b0770d1ebd7068606aea7288bd

logd: fix format-extra-args warning.

Bug: 17409250
Change-Id: Id50ebb57754b12d69ed605d0e2901b8e05c607c6

logd/LogWhiteBlackList.cpp

diff --git a/logd/LogWhiteBlackList.cpp b/logd/LogWhiteBlackList.cpp
index e87b604..9728db1 100644
--- a/logd/LogWhiteBlackList.cpp
+++ b/logd/LogWhiteBlackList.cpp
@@ -39,10 +39,15 @@
 
 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, "/");
     }
 }