[src/netbsd-2-0]: src/sys/sys Pull up revision 1.122 (requested by atatat in ...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/32470570142e
branches:  netbsd-2-0
changeset: 560520:32470570142e
user:      tron <tron%NetBSD.org@localhost>
date:      Thu Apr 22 07:50:48 2004 +0000

description:
Pull up revision 1.122 (requested by atatat in ticket #173):
Move a type cast (wrt description handling) and do a little lint
cleaning.

diffstat:

 sys/sys/sysctl.h |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (23 lines):

diff -r ab8fff83a1bb -r 32470570142e sys/sys/sysctl.h
--- a/sys/sys/sysctl.h  Thu Apr 22 07:49:10 2004 +0000
+++ b/sys/sys/sysctl.h  Thu Apr 22 07:50:48 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sysctl.h,v 1.116.2.4 2004/04/09 20:14:31 jmc Exp $     */
+/*     $NetBSD: sysctl.h,v 1.116.2.5 2004/04/22 07:50:48 tron Exp $    */
 
 /*
  * Copyright (c) 1989, 1993
@@ -1145,10 +1145,10 @@
 
 #define __sysc_desc_roundup(x) ((((x) - 1) | (sizeof(int32_t) - 1)) + 1)
 #define __sysc_desc_adv(d, l) \
-       (((const char*)(d)) + offsetof(struct sysctldesc, descr_str) + \
+       (/*LINTED ptr cast*/(struct sysctldesc *) \
+       ((const char*)(d)) + offsetof(struct sysctldesc, descr_str) + \
                __sysc_desc_roundup(l))
-#define NEXT_DESCR(d) ((struct sysctldesc *) \
-       __sysc_desc_adv((d), (d)->descr_len))
+#define NEXT_DESCR(d) __sysc_desc_adv((d), (d)->descr_len)
 
 static __inline struct sysctlnode *
 sysctl_rootof(struct sysctlnode *n)