diff options
| author | dillon <dillon@FreeBSD.org> | 2003-01-13 00:33:17 +0000 |
|---|---|---|
| committer | dillon <dillon@FreeBSD.org> | 2003-01-13 00:33:17 +0000 |
| commit | ccd5574cc6e61b8fbf6b5ed907375f42e19b54f8 (patch) | |
| tree | ee3c8690226ac4a086122b794c975aab9319b671 /contrib/ipfilter | |
| parent | fe540b81bb4ea3115544cd0f082b4ecd39cebb62 (diff) | |
| download | FreeBSD-src-ccd5574cc6e61b8fbf6b5ed907375f42e19b54f8.zip FreeBSD-src-ccd5574cc6e61b8fbf6b5ed907375f42e19b54f8.tar.gz | |
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.
Diffstat (limited to 'contrib/ipfilter')
| -rw-r--r-- | contrib/ipfilter/ipsend/sock.c | 6 |
1 files changed, 3 insertions, 3 deletions
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; } |
