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

Commit a7db6341 authored by Nandana Dutt's avatar Nandana Dutt
Browse files

Remove unused rename code 

The code that attempts to rename the generated zip file is a no-op
since the new and old names are the same.

Also fixed a couple of typos.

Test: adb shell /data/nativetest64/dumpstate_test/dumpstate_test
Change-Id: I5054e141a8248add15d7ad5a9ef7c40a01c939cd
parent f25cf066

cmds/dumpstate/dumpstate.cpp

+1 −12
Original line number Diff line number Diff line
@@ -1100,7 +1100,7 @@ static void RunDumpsysProto(const std::string& title, int priority, 
    }

}



// Runs dumpsys on services that must dump first and and will take less than 100ms to dump.

// Runs dumpsys on services that must dump first and will take less than 100ms to dump.

static void RunDumpsysCritical() {

    RunDumpsysText("DUMPSYS CRITICAL", IServiceManager::DUMP_FLAG_PRIORITY_CRITICAL,

                   /* timeout= */ 5s, /* service_timeout= */ 500ms);
@@ -1858,17 +1858,6 @@ static void FinalizeFile() { 
            do_text_file = true;

        } else {

            do_text_file = false;

            // Since zip file is already created, it needs to be renamed.

            std::string new_path = ds.GetPath(".zip");

            if (ds.path_ != new_path) {

                MYLOGD("Renaming zip file from %s to %s\n", ds.path_.c_str(), new_path.c_str());

                if (rename(ds.path_.c_str(), new_path.c_str())) {

                    MYLOGE("rename(%s, %s): %s\n", ds.path_.c_str(), new_path.c_str(),

                           strerror(errno));

                } else {

                    ds.path_ = new_path;

                }

            }

        }

    }

    if (do_text_file) {

cmds/dumpstate/dumpstate.h

+1 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ class Dumpstate { 
                                        std::chrono::milliseconds timeout);



    /*

     * Adds a text entry entry to the existing zip file.

     * Adds a text entry to the existing zip file.

     */

    bool AddTextZipEntry(const std::string& entry_name, const std::string& content);