xnu-344.tar.gz

[apple/xnu.git] / bsd / kern / kern_newsysctl.c

diff --git a/bsd/kern/kern_newsysctl.c b/bsd/kern/kern_newsysctl.c
index 0bba174a6ec7b09dc1755330d885da8c21214528..399bbdb92e3ee90aaacea52c23b4d025b79918b4 100644 (file)
--- a/bsd/kern/kern_newsysctl.c
+++ b/bsd/kern/kern_newsysctl.c
@@ -644,7 +644,7 @@ sysctl_old_kernel(struct sysctl_req *req, const void *p, size_t l)
                if (i > req->oldlen - req->oldidx)
                        i = req->oldlen - req->oldidx;
                if (i > 0) {
-                       error = copyout(p, (char *)req->oldptr + req->oldidx, i);
+                       error = copyout((void*)p, (char *)req->oldptr + req->oldidx, i);
                        if (error)
                            return error;
                }
@@ -742,7 +742,7 @@ sysctl_old_user(struct sysctl_req *req, const void *p, size_t l)
                if (i > req->oldlen - req->oldidx)
                        i = req->oldlen - req->oldidx;
                if (i > 0)
-                       error = copyout(p, (char *)req->oldptr + req->oldidx,
+                       error = copyout((void*)p, (char *)req->oldptr + req->oldidx,
                                        i);
        }
        req->oldidx += l;
@@ -828,7 +828,7 @@ found:
         * Switch to the NETWORK funnel for CTL_NET and KERN_IPC sysctls
         */
 
-       if ((req->newptr) && ((name[0] == CTL_NET) || ((name[0] == CTL_KERN) &&
+       if (((name[0] == CTL_NET) || ((name[0] == CTL_KERN) &&
                                                       (name[1] == KERN_IPC))))
             thread_funnel_switch(KERNEL_FUNNEL, NETWORK_FUNNEL);
 
@@ -846,7 +846,7 @@ found:
         * Switch back to the KERNEL funnel, if necessary
         */
 
-       if ((req->newptr) && ((name[0] == CTL_NET) || ((name[0] == CTL_KERN) &&
+       if (((name[0] == CTL_NET) || ((name[0] == CTL_KERN) &&
                                                       (name[1] == KERN_IPC))))
             thread_funnel_switch(NETWORK_FUNNEL, KERNEL_FUNNEL);