From 3ee1ebc7eebcbde2c47c4a92d9a400b172f32d91 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Tue, 1 Aug 2017 03:07:11 +0200 Subject: treewide: Remove useless casts from memcpy pointer arguments. This is using the following semantic patch: @memcpy1@ type T; expression A, B, C; @@ - memcpy((T *)A, B, C) + memcpy(A, B, C) @memcpy2@ type T; expression A, B, C; @@ - memcpy(A, (T *)B, C) + memcpy(A, B, C) Signed-off-by: Ralf Baechle --- tcpip/rip98d.c | 3 ++- tcpip/rip98r.c | 14 ++++++++------ tcpip/rip98t.c | 4 +++- tcpip/ttylinkd.c | 10 +++++----- 4 files changed, 18 insertions(+), 13 deletions(-) (limited to 'tcpip') diff --git a/tcpip/rip98d.c b/tcpip/rip98d.c index b375d70..1fcc46c 100644 --- a/tcpip/rip98d.c +++ b/tcpip/rip98d.c @@ -173,7 +173,8 @@ static int load_dests(void) return FALSE; } - memcpy((char *)&dest_list[dest_count].dest_addr, host->h_addr, host->h_length); + memcpy(&dest_list[dest_count].dest_addr, host->h_addr, + host->h_length); dest_count++; } diff --git a/tcpip/rip98r.c b/tcpip/rip98r.c index 2993666..6082e65 100644 --- a/tcpip/rip98r.c +++ b/tcpip/rip98r.c @@ -116,7 +116,7 @@ void receive_routes(int s) syslog(LOG_DEBUG, "RIP98 message received from %s\n", inet_ntoa(rem_addr.sin_addr)); for (p = message + RIP98_HEADER; p < message + mess_len; p += RIP98_ENTRY) { - memcpy((char *)&addr, (char *)p, sizeof(addr)); + memcpy(&addr, p, sizeof(addr)); bits = p[4]; metric = p[5]; @@ -211,7 +211,7 @@ void receive_routes(int s) trg.sin_family = AF_INET; trg.sin_addr = route->addr; trg.sin_port = 0; - memcpy((char *)&rt.rt_dst, (char *)&trg, sizeof(struct sockaddr)); + memcpy(&rt.rt_dst, &trg, sizeof(struct sockaddr)); if (ioctl(s, SIOCDELRT, &rt) < 0) { if (logging) @@ -227,7 +227,7 @@ void receive_routes(int s) trg.sin_family = AF_INET; trg.sin_addr = route->addr; trg.sin_port = 0; - memcpy((char *)&rt.rt_dst, (char *)&trg, sizeof(struct sockaddr)); + memcpy(&rt.rt_dst, &trg, sizeof(struct sockaddr)); rt.rt_flags = RTF_UP | RTF_GATEWAY | RTF_DYNAMIC; @@ -237,9 +237,11 @@ void receive_routes(int s) netmask = htonl(bits2mask(route->bits)); trg.sin_family = AF_INET; - memcpy((char *)&trg.sin_addr, (char *)&netmask, sizeof(struct in_addr)); + memcpy(&trg.sin_addr, &netmask, + sizeof(struct in_addr)); trg.sin_port = 0; - memcpy((char *)&rt.rt_genmask, (char *)&trg, sizeof(struct sockaddr)); + memcpy(&rt.rt_genmask, &trg, + sizeof(struct sockaddr)); } rt.rt_metric = route->metric + 1; @@ -247,7 +249,7 @@ void receive_routes(int s) trg.sin_family = AF_INET; trg.sin_addr = rem_addr.sin_addr; trg.sin_port = 0; - memcpy((char *)&rt.rt_gateway, (char *)&trg, sizeof(struct sockaddr)); + memcpy(&rt.rt_gateway, &trg, sizeof(struct sockaddr)); if (ioctl(s, SIOCADDRT, &rt) < 0) { if (logging) diff --git a/tcpip/rip98t.c b/tcpip/rip98t.c index 9fd78c6..502b5f4 100644 --- a/tcpip/rip98t.c +++ b/tcpip/rip98t.c @@ -55,7 +55,9 @@ void transmit_routes(int s) while (mess_len < 184 && route != NULL) { if (route->action != DEL_ROUTE) { - memcpy(message + mess_len + 0, (char *)&route->addr, sizeof(struct in_addr)); + memcpy(message + mess_len + 0, + &route->addr, + sizeof(struct in_addr)); message[mess_len + 4] = route->bits; message[mess_len + 5] = route->metric; diff --git a/tcpip/ttylinkd.c b/tcpip/ttylinkd.c index 200cfdd..3020977 100644 --- a/tcpip/ttylinkd.c +++ b/tcpip/ttylinkd.c @@ -254,7 +254,7 @@ int main(int argc, char *argv[]) exit(1); } } - memcpy((char*)&rem_addr, rhe->h_addr, rhe->h_length); + memcpy(&rem_addr, rhe->h_addr, rhe->h_length); /* Get our local address */ phe = gethostbyname(hostname); @@ -263,7 +263,7 @@ int main(int argc, char *argv[]) syslog(LOG_DAEMON | LOG_CRIT, "main(): gethostbyname failed."); exit(1); } - memcpy((char*)&my_addr, phe->h_addr, phe->h_length); + memcpy(&my_addr, phe->h_addr, phe->h_length); /* Create local data socket */ memset((char*)&msg_sa, 0, sizeof(msg_sa)); @@ -271,7 +271,7 @@ int main(int argc, char *argv[]) msg_sa.sa_family = AF_INET; msg_sin = (struct sockaddr_in*)&msg_sa; msg_sin->sin_port = htons(0); - memcpy((char*)&(msg_sin->sin_addr), phe->h_addr, phe->h_length); + memcpy(&(msg_sin->sin_addr), phe->h_addr, phe->h_length); skt = socket(PF_INET, SOCK_STREAM, 0); if (skt < 0) @@ -297,7 +297,7 @@ int main(int argc, char *argv[]) memset((char*)&ctl_sin, 0, sizeof(ctl_sin)); ctl_sin.sin_family = AF_INET; - memcpy((char*)&ctl_sin.sin_addr, phe->h_addr, phe->h_length); + memcpy(&ctl_sin.sin_addr, phe->h_addr, phe->h_length); ctl_sin.sin_port = htons(0); ctl_skt = socket(PF_INET, SOCK_DGRAM, 0); @@ -344,7 +344,7 @@ int main(int argc, char *argv[]) /* The person not there? Send an announce and wake him up */ msg.type = ANNOUNCE; - memcpy((char*)&(msg.addr), (char*)&msg_sa, sizeof(struct osockaddr)); + memcpy(&(msg.addr), &msg_sa, sizeof(struct osockaddr)); msg.addr.sa_family = htons(AF_INET); msg.id_num = -1; i = send_control(ctl_skt, rem_addr, msg, &resp); -- cgit v1.2.3