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.

1 files changed, 1 insertions, 1 deletions

diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c
index 2346bc42e2a6..989145f996d0 100644
--- a/usr.sbin/pstat/pstat.c
+++ b/usr.sbin/pstat/pstat.c
@@ -418,7 +418,7 @@ filemode(void)
 		*fbp = '\0';
 		(void)printf("%6s  %3d", flagbuf, fp->xf_count);
 		(void)printf("  %3d", fp->xf_msgcount);
-		(void)printf("  %8lx", (u_long)(void *)fp->xf_data);
+		(void)printf("  %8lx", (u_long)fp->xun_data.generic);
 		(void)printf("  %jx\n", (uintmax_t)fp->xf_offset);
 	}
 	free(buf);