commit 0f22e490d2d29f92e12327d91732002b4cce13ba
author Yi Kong <yikong@google.com> Fri Jul 04 14:38:23 2025 +0800
committer Yi Kong <yikong@google.com> Tue Jul 08 01:17:50 2025 +0800
tree 6988c612066f9cd70c61a34f2c07f6463dd1b5e0
parent 7effddaa387b5304862871df82c60d0c5e656c67

incidentd: Fix Clang unused-but-set-variable warning

generated by gemini CLI.

Test: presubmit
Bug: 429520052
Flag: EXEMPT, code cleanup
Change-Id: I10b75cc3d63dc1d50e80151e93d3b44f48b66d1a

cmds/incidentd/src/WorkDirectory.cpp

diff --git a/cmds/incidentd/src/WorkDirectory.cpp b/cmds/incidentd/src/WorkDirectory.cpp
index c8d2e0e..5c5d5f4 100644
--- a/cmds/incidentd/src/WorkDirectory.cpp
+++ b/cmds/incidentd/src/WorkDirectory.cpp
@@ -642,6 +642,9 @@
 
     // Load the envelope here inside the lock.
     err = report->loadEnvelope();
+    if (err != NO_ERROR) {
+        return;
+    }
 
     report->removeReport(pkg, cls);
 

tools/incident_report/main.cpp

diff --git a/tools/incident_report/main.cpp b/tools/incident_report/main.cpp
index 974166a..a7d3261 100644
--- a/tools/incident_report/main.cpp
+++ b/tools/incident_report/main.cpp
@@ -305,7 +305,6 @@
 int
 main(int argc, char** argv)
 {
-    enum { OUTPUT_TEXT, OUTPUT_PROTO } outputFormat = OUTPUT_TEXT;
     const char* inFilename = NULL;
     const char* outFilename = NULL;
     const char* reason = NULL;
@@ -318,7 +317,6 @@
     while ((opt = getopt(argc, argv, "bhi:o:r:s:twp:")) != -1) {
         switch (opt) {
             case 'b':
-                outputFormat = OUTPUT_PROTO;
                 break;
             case 'i':
                 inFilename = optarg;
@@ -333,7 +331,6 @@
                 adbSerial = optarg;
                 break;
             case 't':
-                outputFormat = OUTPUT_TEXT;
                 break;
             case 'h':
                 usage(stdout);