From 4b45d6732c649aa15799076d68e5fb5a170819bc Mon Sep 17 00:00:00 2001 From: Mark Salyzyn Date: Fri, 11 Dec 2015 10:41:52 -0800 Subject: dumpstate: build breakage @2482293 aosp is in C, internal is C++, struct must be explicit Bug: 24200279 Change-Id: I1c9d8156a86db6de73ee5b70063e63b38170b052 --- cmds/dumpstate/utils.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'cmds/dumpstate/utils.c') 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; } -- cgit v1.2.3-59-g8ed1b