On Tue, Feb 23, 2021 at 07:31:30PM +1000, David Gwynne wrote:
> i'm not a fan of having to cast to caddr_t when we have modern
> inventions like void *s we can take advantage of.
Shoud you remove all the (caddr_t) casts in the callers then?
Without that step this diff does not provide more consistency.
bluhm
> ok?
>
> Index: share/man/man9/mbuf.9
> ===================================================================
> RCS file: /cvs/src/share/man/man9/mbuf.9,v
> retrieving revision 1.120
> diff -u -p -r1.120 mbuf.9
> --- share/man/man9/mbuf.9 12 Dec 2020 11:48:52 -0000 1.120
> +++ share/man/man9/mbuf.9 23 Feb 2021 09:29:55 -0000
> @@ -116,7 +116,7 @@
> .Ft void
> .Fn m_reclaim "void"
> .Ft void
> -.Fn m_copydata "struct mbuf *m" "int off" "int len" "caddr_t cp"
> +.Fn m_copydata "struct mbuf *m" "int off" "int len" "void *cp"
> .Ft void
> .Fn m_cat "struct mbuf *m" "struct mbuf *n"
> .Ft struct mbuf *
> @@ -673,7 +673,7 @@ is a
> pointer, no action occurs.
> .It Fn m_reclaim "void"
> Ask protocols to free unused memory space.
> -.It Fn m_copydata "struct mbuf *m" "int off" "int len" "caddr_t cp"
> +.It Fn m_copydata "struct mbuf *m" "int off" "int len" "void *cp"
> Copy data from the mbuf chain pointed to by
> .Fa m
> starting at
> Index: sys/sys/mbuf.h
> ===================================================================
> RCS file: /cvs/src/sys/sys/mbuf.h,v
> retrieving revision 1.251
> diff -u -p -r1.251 mbuf.h
> --- sys/sys/mbuf.h 12 Dec 2020 11:49:02 -0000 1.251
> +++ sys/sys/mbuf.h 23 Feb 2021 09:29:55 -0000
> @@ -435,7 +435,7 @@ int m_copyback(struct mbuf *, int, int,
> struct mbuf *m_freem(struct mbuf *);
> void m_purge(struct mbuf *);
> void m_reclaim(void *, int);
> -void m_copydata(struct mbuf *, int, int, caddr_t);
> +void m_copydata(struct mbuf *, int, int, void *);
> void m_cat(struct mbuf *, struct mbuf *);
> struct mbuf *m_devget(char *, int, int);
> int m_apply(struct mbuf *, int, int,
> Index: sys/kern/uipc_mbuf.c
> ===================================================================
> RCS file: /cvs/src/sys/kern/uipc_mbuf.c,v
> retrieving revision 1.277
> diff -u -p -r1.277 uipc_mbuf.c
> --- sys/kern/uipc_mbuf.c 13 Jan 2021 12:38:36 -0000 1.277
> +++ sys/kern/uipc_mbuf.c 23 Feb 2021 09:29:55 -0000
> @@ -711,8 +711,9 @@ nospace:
> * continuing for "len" bytes, into the indicated buffer.
> */
> void
> -m_copydata(struct mbuf *m, int off, int len, caddr_t cp)
> +m_copydata(struct mbuf *m, int off, int len, void *p)
> {
> + caddr_t cp = p;
> unsigned count;
>
> if (off < 0)
