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

Commit 282aaee1 authored by Andreas Gampe's avatar Andreas Gampe Committed by android-build-merger
Browse files

Dumpstate: Fix long lines. am: 27cd7b25 

am: 00c6b9cc

Change-Id: I8e57a3e41858acce7342061ba6f10ab199952219
parents 07e9a14b 00c6b9cc

cmds/dumpstate/dumpstate.cpp

+4 −3
Original line number Diff line number Diff line
@@ -629,7 +629,8 @@ bool add_zip_entry_from_fd(const std::string& entry_name, int fd) { 
}



bool add_zip_entry(const std::string& entry_name, const std::string& entry_path) {

    android::base::unique_fd fd(TEMP_FAILURE_RETRY(open(entry_path.c_str(), O_RDONLY | O_NONBLOCK | O_CLOEXEC)));

    android::base::unique_fd fd(TEMP_FAILURE_RETRY(open(entry_path.c_str(), O_RDONLY | O_NONBLOCK

            | O_CLOEXEC)));

    if (fd == -1) {

        MYLOGE("open(%s): %s\n", entry_path.c_str(), strerror(errno));

        return false;
@@ -1069,8 +1070,8 @@ static bool finish_zip_file(const std::string& bugreport_name, const std::string 
}



static std::string SHA256_file_hash(std::string filepath) {

    android::base::unique_fd fd(TEMP_FAILURE_RETRY(open(filepath.c_str(), O_RDONLY | O_NONBLOCK | O_CLOEXEC

            | O_NOFOLLOW)));

    android::base::unique_fd fd(TEMP_FAILURE_RETRY(open(filepath.c_str(), O_RDONLY | O_NONBLOCK

            | O_CLOEXEC | O_NOFOLLOW)));

    if (fd == -1) {

        MYLOGE("open(%s): %s\n", filepath.c_str(), strerror(errno));

        return NULL;