summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2015-12-11 10:41:52 -0800
committerMark Salyzyn <salyzyn@google.com>2015-12-11 10:42:28 -0800
commit4b45d6732c649aa15799076d68e5fb5a170819bc (patch)
tree69be01fe5828f29c3f0c4aee6eb567942ac661e4
parentf9b3fc457f22be834e6bc6c3f704d7ddb38dcbb8 (diff)
downloadnative-4b45d6732c649aa15799076d68e5fb5a170819bc.tar.gz
dumpstate: build breakage @2482293
aosp is in C, internal is C++, struct must be explicit Bug: 24200279 Change-Id: I1c9d8156a86db6de73ee5b70063e63b38170b052
-rw-r--r--cmds/dumpstate/utils.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/cmds/dumpstate/utils.c b/cmds/dumpstate/utils.c
index 4ae2066ccd..47acb6385c 100644
--- a/cmds/dumpstate/utils.c
+++ b/cmds/dumpstate/utils.c
@@ -796,7 +796,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);
@@ -814,7 +814,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;
}
@@ -836,7 +836,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;
}
@@ -872,7 +872,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;
}