diff options
| author | dillon <dillon@FreeBSD.org> | 2003-01-12 01:37:13 +0000 |
|---|---|---|
| committer | dillon <dillon@FreeBSD.org> | 2003-01-12 01:37:13 +0000 |
| commit | ddf9ef103e0a611c9a01425a28baf8a612b0d114 (patch) | |
| tree | 19da0d56c468b8e0f6d0361d7d39157f561aa69f /contrib/ipfilter | |
| parent | 07cbccc353d7afbe8948b6025965ca36739d7373 (diff) | |
| download | FreeBSD-src-ddf9ef103e0a611c9a01425a28baf8a612b0d114.zip FreeBSD-src-ddf9ef103e0a611c9a01425a28baf8a612b0d114.tar.gz | |
Change struct file f_data to un_data, a union of the correct struct
pointer types, and remove a huge number of casts from code using it.
Change struct xfile xf_data to xun_data (ABI is still compatible).
If we need to add a #define for f_data and xf_data we can, but I don't
think it will be necessary. There are no operational changes in this
commit.
Diffstat (limited to 'contrib/ipfilter')
| -rw-r--r-- | contrib/ipfilter/ipsend/sock.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/contrib/ipfilter/ipsend/sock.c b/contrib/ipfilter/ipsend/sock.c index 46a399a..cb9dba8 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->f_data, sizeof(*s)) == -1) + if (KMCPY(s, f->un_data.socket, sizeof(*s)) == -1) { fprintf(stderr, "read(%#x,%#x,%d) - f_data - failed\n", o[fd], s, sizeof(*s)); @@ -316,10 +316,11 @@ struct tcpiphdr *ti; } s = (struct socket *)calloc(1, sizeof(*s)); - if (KMCPY(s, f->f_data, sizeof(*s)) == -1) + if (KMCPY(s, f->un_data.socket, sizeof(*s)) == -1) { fprintf(stderr, "read(%#lx,%#lx,%lu) - f_data - failed\n", - (u_long)f->f_data, (u_long)s, (u_long)sizeof(*s)); + (u_long)f->un_data.socket, (u_long)s, + (u_long)sizeof(*s)); return NULL; } |
