Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/netsmb/Attic/subr_mchain.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/netsmb/Attic/subr_mchain.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- src/sys/netsmb/Attic/subr_mchain.c	2006/03/01 12:38:32	1.13
+++ src/sys/netsmb/Attic/subr_mchain.c	2007/03/04 06:03:36	1.14
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_mchain.c,v 1.13 2006/03/01 12:38:32 yamt Exp $	*/
+/*	$NetBSD: subr_mchain.c,v 1.14 2007/03/04 06:03:36 christos Exp $	*/
 
 /*
  * Copyright (c) 2000, 2001 Boris Popov
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_mchain.c,v 1.13 2006/03/01 12:38:32 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_mchain.c,v 1.14 2007/03/04 06:03:36 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -177,11 +177,11 @@ mb_fixhdr(struct mbchain *mbp)
  * Return pointer to the object placeholder or NULL if any error occurred.
  * Note: size should be <= MLEN
  */
-caddr_t
+void *
 mb_reserve(struct mbchain *mbp, int size)
 {
 	struct mbuf *m, *mn;
-	caddr_t bpos;
+	void *bpos;
 
 	if (size > MLEN)
 		panic("mb_reserve: size = %d", size);
@@ -197,7 +197,7 @@ mb_reserve(struct mbchain *mbp, int size
 	}
 	mbp->mb_mleft -= size;
 	mbp->mb_count += size;
-	bpos = mtod(m, caddr_t) + m->m_len;
+	bpos = mtod(m, char *) + m->m_len;
 	m->m_len += size;
 	return bpos;
 }
@@ -205,49 +205,49 @@ mb_reserve(struct mbchain *mbp, int size
 int
 mb_put_uint8(struct mbchain *mbp, u_int8_t x)
 {
-	return mb_put_mem(mbp, (caddr_t)&x, sizeof(x), MB_MSYSTEM);
+	return mb_put_mem(mbp, (void *)&x, sizeof(x), MB_MSYSTEM);
 }
 
 int
 mb_put_uint16be(struct mbchain *mbp, u_int16_t x)
 {
 	x = htobe16(x);
-	return mb_put_mem(mbp, (caddr_t)&x, sizeof(x), MB_MSYSTEM);
+	return mb_put_mem(mbp, (void *)&x, sizeof(x), MB_MSYSTEM);
 }
 
 int
 mb_put_uint16le(struct mbchain *mbp, u_int16_t x)
 {
 	x = htole16(x);
-	return mb_put_mem(mbp, (caddr_t)&x, sizeof(x), MB_MSYSTEM);
+	return mb_put_mem(mbp, (void *)&x, sizeof(x), MB_MSYSTEM);
 }
 
 int
 mb_put_uint32be(struct mbchain *mbp, u_int32_t x)
 {
 	x = htobe32(x);
-	return mb_put_mem(mbp, (caddr_t)&x, sizeof(x), MB_MSYSTEM);
+	return mb_put_mem(mbp, (void *)&x, sizeof(x), MB_MSYSTEM);
 }
 
 int
 mb_put_uint32le(struct mbchain *mbp, u_int32_t x)
 {
 	x = htole32(x);
-	return mb_put_mem(mbp, (caddr_t)&x, sizeof(x), MB_MSYSTEM);
+	return mb_put_mem(mbp, (void *)&x, sizeof(x), MB_MSYSTEM);
 }
 
 int
 mb_put_int64be(struct mbchain *mbp, int64_t x)
 {
 	x = htobe64(x);
-	return mb_put_mem(mbp, (caddr_t)&x, sizeof(x), MB_MSYSTEM);
+	return mb_put_mem(mbp, (void *)&x, sizeof(x), MB_MSYSTEM);
 }
 
 int
 mb_put_int64le(struct mbchain *mbp, int64_t x)
 {
 	x = htole64(x);
-	return mb_put_mem(mbp, (caddr_t)&x, sizeof(x), MB_MSYSTEM);
+	return mb_put_mem(mbp, (void *)&x, sizeof(x), MB_MSYSTEM);
 }
 
 int
@@ -273,7 +273,7 @@ mb_put_mem(struct mbchain *mbp, const ch
 			continue;
 		}
 		cplen = mleft > size ? size : mleft;
-		dst = mtod(m, caddr_t) + m->m_len;
+		dst = mtod(m, char *) + m->m_len;
 		switch (type) {
 		    case MB_MCUSTOM:
 			error = mbp->mb_copy(mbp, source, dst, cplen);
@@ -438,7 +438,7 @@ md_get_uint8(struct mdchain *mdp, u_int8
 int
 md_get_uint16(struct mdchain *mdp, u_int16_t *x)
 {
-	return md_get_mem(mdp, (caddr_t)x, 2, MB_MINLINE);
+	return md_get_mem(mdp, (void *)x, 2, MB_MINLINE);
 }
 
 int
@@ -463,7 +463,7 @@ md_get_uint16be(struct mdchain *mdp, u_i
 int
 md_get_uint32(struct mdchain *mdp, u_int32_t *x)
 {
-	return md_get_mem(mdp, (caddr_t)x, 4, MB_MINLINE);
+	return md_get_mem(mdp, (void *)x, 4, MB_MINLINE);
 }
 
 int
@@ -491,7 +491,7 @@ md_get_uint32le(struct mdchain *mdp, u_i
 int
 md_get_int64(struct mdchain *mdp, int64_t *x)
 {
-	return md_get_mem(mdp, (caddr_t)x, 8, MB_MINLINE);
+	return md_get_mem(mdp, (void *)x, 8, MB_MINLINE);
 }
 
 int
@@ -517,8 +517,9 @@ md_get_int64le(struct mdchain *mdp, int6
 }
 
 int
-md_get_mem(struct mdchain *mdp, caddr_t target, int size, int type)
+md_get_mem(struct mdchain *mdp, void *targetv, int size, int type)
 {
+	char *target = targetv;
 	struct mbuf *m = mdp->md_cur;
 	int error;
 	u_int count;
@@ -536,7 +537,7 @@ md_get_mem(struct mdchain *mdp, caddr_t 
 		if (count == 0) {
 			mdp->md_cur = m = m->m_next;
 			if (m)
-				s = mdp->md_pos = mtod(m, caddr_t);
+				s = mdp->md_pos = mtod(m, void *);
 			continue;
 		}
 		if (count > size)