Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c3635b2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "incidentd: Fix Clang unused-but-set-variable warning" into main

parents 6276b6e3 0f22e490

cmds/incidentd/src/WorkDirectory.cpp

+3 −0
Original line number Diff line number Diff line
@@ -642,6 +642,9 @@ void WorkDirectory::commit(const sp<ReportFile>& report, const string& pkg, cons 


    // Load the envelope here inside the lock.

    err = report->loadEnvelope();

    if (err != NO_ERROR) {

        return;

    }



    report->removeReport(pkg, cls);

tools/incident_report/main.cpp

+0 −3
Original line number Diff line number Diff line
@@ -305,7 +305,6 @@ usage(FILE* out) 
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 @@ main(int argc, char** argv) 
    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 @@ main(int argc, char** argv) 
                adbSerial = optarg;

                break;

            case 't':

                outputFormat = OUTPUT_TEXT;

                break;

            case 'h':

                usage(stdout);