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

Commit 7def230c authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge "dumpstate: build breakage @2482293" am: c93d0937 

am: 8197219a

* commit '8197219a':
  dumpstate: build breakage @2482293
parents a70d2615 8197219a

cmds/dumpstate/utils.cpp

+4 −4
Original line number Diff line number Diff line
@@ -902,7 +902,7 @@ void dump_emmc_ecsd(const char *ext_csd_path) { 
        "Undefined",

        "Normal",

        "Warning (consumed 80% of reserve)",

        "Urgent (consumeed 90% of reserve)"

        "Urgent (consumed 90% of reserve)"

    };



    printf("------ %s Extended CSD ------\n", ext_csd_path);
@@ -920,7 +920,7 @@ void dump_emmc_ecsd(const char *ext_csd_path) { 
        printf("*** %s: %s\n\n", ext_csd_path, strerror(errno));

        return;

    }

    if (bytes_read < (ssize_t)(EXT_CSD_REV * sizeof(hex))) {

    if (bytes_read < (ssize_t)(EXT_CSD_REV * sizeof(struct hex))) {

        printf("*** %s: truncated content %zd\n\n", ext_csd_path, bytes_read);

        return;

    }
@@ -942,7 +942,7 @@ void dump_emmc_ecsd(const char *ext_csd_path) { 
        return;

    }



    if (bytes_read < (ssize_t)(EXT_PRE_EOL_INFO * sizeof(hex))) {

    if (bytes_read < (ssize_t)(EXT_PRE_EOL_INFO * sizeof(struct hex))) {

        printf("*** %s: truncated content %zd\n\n", ext_csd_path, bytes_read);

        return;

    }
@@ -978,7 +978,7 @@ void dump_emmc_ecsd(const char *ext_csd_path) { 
            "Exceeded the maximum estimated device lifetime",

        };



        if (bytes_read < (ssize_t)(lifetime * sizeof(hex))) {

        if (bytes_read < (ssize_t)(lifetime * sizeof(struct hex))) {

            printf("*** %s: truncated content %zd\n", ext_csd_path, bytes_read);

            break;

        }