diff options
| author | Tom Hughes <tomhughes@chromium.org> | 2021-04-30 16:24:50 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-05-06 17:29:59 +0000 |
| commit | e0a4e5ab99a45faa196b3894ade8c375061a7ab6 (patch) | |
| tree | b20a581a87a8c8513068280cad1c496d7f472137 /util/comm-dev.c | |
| parent | 1f4c9670318eca8c6b7bdc674fa2a4930e21a5c4 (diff) | |
| download | chrome-ec-e0a4e5ab99a45faa196b3894ade8c375061a7ab6.tar.gz | |
util: Add explicit casts
When compiling with C++, the implicit casting that is performed in C is
disallowed. Add casts in preparation for C++ compatibility.
BRANCH=none
BUG=b:144959033
TEST=make buildall
Signed-off-by: Tom Hughes <tomhughes@chromium.org>
Change-Id: I5c25440819428db65225c772c1c5115a735db58a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2864519
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'util/comm-dev.c')
| -rw-r--r-- | util/comm-dev.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/util/comm-dev.c b/util/comm-dev.c index 679f15225f..e73538b323 100644 --- a/util/comm-dev.c +++ b/util/comm-dev.c @@ -73,7 +73,7 @@ static int ec_command_dev(int command, int version, s_cmd.outsize = outsize; s_cmd.outdata = (uint8_t *)outdata; s_cmd.insize = insize; - s_cmd.indata = indata; + s_cmd.indata = (uint8_t *)(indata); r = ioctl(fd, CROS_EC_DEV_IOCXCMD, &s_cmd); if (r < 0) { @@ -107,7 +107,7 @@ static int ec_readmem_dev(int offset, int bytes, void *dest) if (!fake_it) { s_mem.offset = offset; s_mem.bytes = bytes; - s_mem.buffer = dest; + s_mem.buffer = (char *)(dest); r = ioctl(fd, CROS_EC_DEV_IOCRDMEM, &s_mem); if (r < 0 && errno == ENOTTY) fake_it = 1; @@ -134,8 +134,8 @@ static int ec_command_dev_v2(int command, int version, assert(outsize == 0 || outdata != NULL); assert(insize == 0 || indata != NULL); - s_cmd = malloc(sizeof(struct cros_ec_command_v2) + - MAX(outsize, insize)); + s_cmd = (struct cros_ec_command_v2 *)(malloc( + sizeof(struct cros_ec_command_v2) + MAX(outsize, insize))); if (s_cmd == NULL) return -EC_RES_ERROR; |