From 385fb715646074735ef39b8f915cc8d5c7e64271 Mon Sep 17 00:00:00 2001
From: Michael Tuexen <tuexen@fh-muenster.de>
Date: Mon, 21 Sep 2015 22:06:26 +0200
Subject: [PATCH] Use appropriate casts.
---
gtests/net/packetdrill/run_system_call.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/gtests/net/packetdrill/run_system_call.c b/gtests/net/packetdrill/run_system_call.c
index d1ff8c59..3cc3ed99 100644
--- a/gtests/net/packetdrill/run_system_call.c
+++ b/gtests/net/packetdrill/run_system_call.c
@@ -1582,23 +1582,23 @@ static int syscall_getsockopt(struct state *state, struct syscall_spec *syscall,
if (val_expression == NULL) {
return STATUS_ERR;
} else if (val_expression->type == EXPR_LINGER) {
- live_optval = (void *) malloc(sizeof(val_expression->value.linger));
- live_optlen = sizeof(val_expression->value.linger);
+ live_optval = malloc(sizeof(val_expression->value.linger));
+ live_optlen = (socklen_t)sizeof(val_expression->value.linger);
#ifdef SCTP_RTOINFO
} else if (val_expression->type == EXPR_SCTP_RTOINFO) {
- live_optval = (void*) malloc(sizeof(val_expression->value.sctp_rtoinfo));
- live_optlen = sizeof(val_expression->value.sctp_rtoinfo);
+ live_optval = malloc(sizeof(val_expression->value.sctp_rtoinfo));
+ live_optlen = (socklen_t)sizeof(val_expression->value.sctp_rtoinfo);
#endif
#ifdef SCTP_STATUS
} else if (val_expression->type == EXPR_SCTP_STATUS) {
- live_optval = (void*) malloc(sizeof(val_expression->value.sctp_status));
- live_optlen = sizeof(val_expression->value.sctp_status);
+ live_optval = malloc(sizeof(val_expression->value.sctp_status));
+ live_optlen = (socklen_t)sizeof(val_expression->value.sctp_status);
((struct sctp_status*) live_optval)->sstat_assoc_id = val_expression->value.sctp_status.sstat_assoc_id;
#endif
} else {
s32_bracketed_arg(args, 3, &script_optval, error);
- live_optval = (void *) malloc(sizeof(int));
- live_optlen = sizeof(int);
+ live_optval = malloc(sizeof(int));
+ live_optlen = (socklen_t)sizeof(int);
}
begin_syscall(state, syscall);
--
GitLab