commit c93d0937e4e86a260f4dc6b91971b6750f67a3f3
author Mark Salyzyn <salyzyn@google.com> Fri Dec 11 18:43:21 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 11 18:43:21 2015 +0000
tree 69be01fe5828f29c3f0c4aee6eb567942ac661e4
parent f9b3fc457f22be834e6bc6c3f704d7ddb38dcbb8
parent 4b45d6732c649aa15799076d68e5fb5a170819bc

Merge "dumpstate: build breakage @2482293"

cmds/dumpstate/utils.c

diff --git a/cmds/dumpstate/utils.c b/cmds/dumpstate/utils.c
index 4ae2066..47acb63 100644
--- a/cmds/dumpstate/utils.c
+++ b/cmds/dumpstate/utils.c
@@ -796,7 +796,7 @@
         "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);
@@ -814,7 +814,7 @@
         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;
     }
@@ -836,7 +836,7 @@
         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;
     }
@@ -872,7 +872,7 @@
             "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;
         }