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

Commit 829e1af1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Rename tmp files" into rvc-dev am: d982cfb6 am: 1f3c2cca am: cadecfb9 

Change-Id: I9c15eff792a397252e8a32e6a1b038e1da5d8fa5
parents 21da9743 cadecfb9

cmds/dumpstate/dumpstate.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -2171,7 +2171,7 @@ static void PrepareToWriteToFile() { 
    }

    }





    if (ds.options_->do_screenshot) {

    if (ds.options_->do_screenshot) {

        ds.screenshot_path_ = ds.GetPath(ds.CalledByApi() ? "-tmp.png" : ".png");

        ds.screenshot_path_ = ds.GetPath(ds.CalledByApi() ? "-png.tmp" : ".png");

    }

    }

    ds.tmp_path_ = ds.GetPath(".tmp");

    ds.tmp_path_ = ds.GetPath(".tmp");

    ds.log_path_ = ds.GetPath("-dumpstate_log-" + std::to_string(ds.pid_) + ".txt");

    ds.log_path_ = ds.GetPath("-dumpstate_log-" + std::to_string(ds.pid_) + ".txt");
@@ -2190,7 +2190,7 @@ static void PrepareToWriteToFile() { 
        ds.tmp_path_.c_str(), ds.screenshot_path_.c_str());

        ds.tmp_path_.c_str(), ds.screenshot_path_.c_str());





    if (ds.options_->do_zip_file) {

    if (ds.options_->do_zip_file) {

        ds.path_ = ds.GetPath(ds.CalledByApi() ? "-tmp.zip" : ".zip");

        ds.path_ = ds.GetPath(ds.CalledByApi() ? "-zip.tmp" : ".zip");

        MYLOGD("Creating initial .zip file (%s)\n", ds.path_.c_str());

        MYLOGD("Creating initial .zip file (%s)\n", ds.path_.c_str());

        create_parent_dirs(ds.path_.c_str());

        create_parent_dirs(ds.path_.c_str());

        ds.zip_file.reset(fopen(ds.path_.c_str(), "wb"));

        ds.zip_file.reset(fopen(ds.path_.c_str(), "wb"));