From ccd5574cc6e61b8fbf6b5ed907375f42e19b54f8 Mon Sep 17 00:00:00 2001 From: dillon Date: Mon, 13 Jan 2003 00:33:17 +0000 Subject: Bow to the whining masses and change a union back into void *. Retain removal of unnecessary casts and throw in some minor cleanups to see if anyone complains, just for the hell of it. --- contrib/ipfilter/ipsend/sock.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'contrib/ipfilter') diff --git a/contrib/ipfilter/ipsend/sock.c b/contrib/ipfilter/ipsend/sock.c index cb9dba8..519cedf 100644 --- a/contrib/ipfilter/ipsend/sock.c +++ b/contrib/ipfilter/ipsend/sock.c @@ -222,7 +222,7 @@ struct tcpiphdr *ti; } s = (struct socket *)calloc(1, sizeof(*s)); - if (KMCPY(s, f->un_data.socket, sizeof(*s)) == -1) + if (KMCPY(s, f->f_data, sizeof(*s)) == -1) { fprintf(stderr, "read(%#x,%#x,%d) - f_data - failed\n", o[fd], s, sizeof(*s)); @@ -316,10 +316,10 @@ struct tcpiphdr *ti; } s = (struct socket *)calloc(1, sizeof(*s)); - if (KMCPY(s, f->un_data.socket, sizeof(*s)) == -1) + if (KMCPY(s, f->f_data, sizeof(*s)) == -1) { fprintf(stderr, "read(%#lx,%#lx,%lu) - f_data - failed\n", - (u_long)f->un_data.socket, (u_long)s, + (u_long)f->f_data, (u_long)s, (u_long)sizeof(*s)); return NULL; } -- cgit v1.1