From d89233484329a2c0c1d26cdc650b4b4500e7a2ab Mon Sep 17 00:00:00 2001
From: Michael Tuexen <tuexen@fh-muenster.de>
Date: Sat, 7 Oct 2017 17:47:24 +0200
Subject: [PATCH] Fix CID 187186 and CID 187212.
---
gtests/net/packetdrill/run_system_call.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/gtests/net/packetdrill/run_system_call.c b/gtests/net/packetdrill/run_system_call.c
index e8ee0ef9..9ab6c80e 100644
--- a/gtests/net/packetdrill/run_system_call.c
+++ b/gtests/net/packetdrill/run_system_call.c
@@ -5541,7 +5541,7 @@ static int syscall_sctp_sendv(struct state *state, struct syscall_spec *syscall,
get_sockstorage_arg(addrs_expr, (struct sockaddr_storage *)addrs, live_fd);
} else if (addrs_expr->type == EXPR_LIST) {
size_t size;
- if (get_sockaddr_from_list(addrs_expr, &size, &addrs, error)) {
+ if (get_sockaddr_from_list(addrs_expr, &size, &addrs, error)) {
goto error_out;
}
} else if (addrs_expr->type != EXPR_NULL) {
@@ -6561,9 +6561,9 @@ static int syscall_sctp_getpaddrs(struct state *state, struct syscall_spec *sysc
goto error_out;
}
if (live_addr->sa_family == AF_INET) {
- live_addr = (struct sockaddr *)((caddr_t *)live_addr + sizeof(struct sockaddr_in));
+ live_addr = (struct sockaddr *)((caddr_t)live_addr + sizeof(struct sockaddr_in));
} else if (live_addr->sa_family == AF_INET6) {
- live_addr = (struct sockaddr *)((caddr_t *)live_addr + sizeof(struct sockaddr_in6));
+ live_addr = (struct sockaddr *)((caddr_t)live_addr + sizeof(struct sockaddr_in6));
} else {
asprintf(error, "Bad Type of addrs[%d]", i);
goto error_out;
@@ -6646,9 +6646,9 @@ static int syscall_sctp_getladdrs(struct state *state, struct syscall_spec *sysc
goto error_out;
}
if (live_addr->sa_family == AF_INET) {
- live_addr = (struct sockaddr *)((caddr_t *)live_addr + sizeof(struct sockaddr_in));
+ live_addr = (struct sockaddr *)((caddr_t)live_addr + sizeof(struct sockaddr_in));
} else if (live_addr->sa_family == AF_INET6) {
- live_addr = (struct sockaddr *)((caddr_t *)live_addr + sizeof(struct sockaddr_in6));
+ live_addr = (struct sockaddr *)((caddr_t)live_addr + sizeof(struct sockaddr_in6));
} else {
asprintf(error, "Bad Type of addrs[%d]", i);
goto error_out;
--
GitLab