commit f45bd38d476ae2fafa34edc4445b9b6a346803f0
author Elliott Hughes <enh@google.com> Tue Sep 07 18:23:48 2021 -0700
committer Elliott Hughes <enh@google.com> Tue Sep 07 18:23:48 2021 -0700
tree 9b5acc64db38b1176186b1544bb0c84f8c660c26
parent 7c2d7bdba370cf9269210f82869eb98414e3fa36

logcat: fix "-c is ambiguous with both -f and -L specified" when -c wasn't specified.

Bug: http://b/199046044
Test: treehugger
Change-Id: Ic9ba6e1c43b487409530c2fc1b08acf8a9e8a398

logcat/logcat.cpp

diff --git a/logcat/logcat.cpp b/logcat/logcat.cpp
index 25fda5d..51a7194 100644
--- a/logcat/logcat.cpp
+++ b/logcat/logcat.cpp
@@ -898,13 +898,13 @@
     }
 
     if (mode & ANDROID_LOG_PSTORE) {
-        if (output_file_name_) {
-            error(EXIT_FAILURE, 0, "-c is ambiguous with both -f and -L specified.");
-        }
         if (setLogSize || getLogSize || printStatistics || getPruneList || setPruneList) {
             error(EXIT_FAILURE, 0, "-L is incompatible with -g/-G, -S, and -p/-P.");
         }
         if (clearLog) {
+            if (output_file_name_) {
+                error(EXIT_FAILURE, 0, "-c is ambiguous with both -f and -L specified.");
+            }
             unlink("/sys/fs/pstore/pmsg-ramoops-0");
             return EXIT_SUCCESS;
         }