[PATCH 3/8] Cleanup of the copyin() and copyout() calls

[Marin Ramesa]

* device/ds_routines.c (device_write_trap) (copyin) (data): Cast to (void *). 
Argument is an address.
(device_write_trap) (copyin) (io_data): Don't cast. Argument is a pointer.
(device_writev_trap) (copyin) (iovec): Likewise.
(device_writev_trap) (copyin) (stack_iovec): Likewise.
(device_writev_trap) (copyin) (data): Cast to (void *). Argument is an address.
(device_writev_trap) (copyin) (p): Likewise.
* kern/bootstrap.c (build_args_and_stack) (copyout) (arg_count): Likewise.
(build_args_and_stack) (copyout) (string_pos): Likewise.
(build_args_and_stack) (copyout) (zero): Likewise.
* kern/ipc_mig.c (syscall_vm_map) (copyin) (address): Don't cast. Argument is a 
pointer.
(syscall_vm_map) (copyin) (addr): Cast to (void *). Argument is an address.
(syscall_task_create) (copyout) (name): Likewise.
(syscall_task_create) (copyout) (child_task): Don't cast. Argument is a pointer.
(syscall_mach_port_allocate) (copyout) (name): Cast to (void *). Argument is an 
address.
(syscall_mach_port_allocate) (copyout) (namep): Don't cast. Argument is a 
pointer.
* kern/time_stamp.c (copyout) (temp): Cast to (void *). Argument is an address.
(copyout) (tsp): Don't cast. Argument is a pointer.

---
 device/ds_routines.c | 10 +++++-----
 kern/bootstrap.c     | 10 +++++-----
 kern/ipc_mig.c       | 12 ++++++------
 kern/time_stamp.c    |  4 ++--
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/device/ds_routines.c b/device/ds_routines.c
index d62be2b..93d474d 100644
--- a/device/ds_routines.c
+++ b/device/ds_routines.c
@@ -1688,7 +1688,7 @@ device_write_trap (mach_device_t device, dev_mode_t mode,
         * Copy the data from user space.
         */
        if (data_count > 0)
-               copyin((char *)data, (char *)ior->io_data, data_count);
+               copyin((void *)data, ior->io_data, data_count);
 
        /*
         * The ior keeps an extra reference for the device.
@@ -1735,8 +1735,8 @@ device_writev_trap (mach_device_t device, dev_mode_t mode,
         */
        if (iocount > 16)
                return KERN_INVALID_VALUE; /* lame */
-       copyin((char *)iovec,
-              (char *)stack_iovec,
+       copyin(iovec,
+              stack_iovec,
               iocount * sizeof(io_buf_vec_t));
        for (data_count = 0, i = 0; i < iocount; i++)
                data_count += stack_iovec[i].count;
@@ -1774,8 +1774,8 @@ device_writev_trap (mach_device_t device, dev_mode_t mode,
 
                p = (vm_offset_t) ior->io_data;
                for (i = 0; i < iocount; i++) {
-                       copyin((char *) stack_iovec[i].data,
-                              (char *) p,
+                       copyin((void *) stack_iovec[i].data,
+                              (void *) p,
                               stack_iovec[i].count);
                        p += stack_iovec[i].count;
                }
diff --git a/kern/bootstrap.c b/kern/bootstrap.c
index 41b02fe..909737f 100644
--- a/kern/bootstrap.c
+++ b/kern/bootstrap.c
@@ -587,7 +587,7 @@ build_args_and_stack(struct exec_info *boot_exec_info,
        /*
         * first the argument count
         */
-       (void) copyout((char *)&arg_count,
+       (void) copyout((void *)&arg_count,
                        arg_pos,
                        sizeof(integer_t));
        arg_pos += sizeof(integer_t);
@@ -600,7 +600,7 @@ build_args_and_stack(struct exec_info *boot_exec_info,
            arg_item_len = strlen(arg_ptr) + 1; /* include trailing 0 */
 
            /* set string pointer */
-           (void) copyout((char *)&string_pos,
+           (void) copyout((void *)&string_pos,
                        arg_pos,
                        sizeof (char *));
            arg_pos += sizeof(char *);
@@ -613,7 +613,7 @@ build_args_and_stack(struct exec_info *boot_exec_info,
        /*
         * Null terminator for argv.
         */
-       (void) copyout((char *)&zero, arg_pos, sizeof(char *));
+       (void) copyout((void *)&zero, arg_pos, sizeof(char *));
        arg_pos += sizeof(char *);
 
        /*
@@ -624,7 +624,7 @@ build_args_and_stack(struct exec_info *boot_exec_info,
            arg_item_len = strlen(arg_ptr) + 1; /* include trailing 0 */
 
            /* set string pointer */
-           (void) copyout((char *)&string_pos,
+           (void) copyout((void *)&string_pos,
                        arg_pos,
                        sizeof (char *));
            arg_pos += sizeof(char *);
@@ -637,7 +637,7 @@ build_args_and_stack(struct exec_info *boot_exec_info,
        /*
         * Null terminator for envp.
         */
-       (void) copyout((char *)&zero, arg_pos, sizeof(char *));
+       (void) copyout((void *)&zero, arg_pos, sizeof(char *));
 }
 
 
diff --git a/kern/ipc_mig.c b/kern/ipc_mig.c
index 3cd0f88..f5e8e14 100644
--- a/kern/ipc_mig.c
+++ b/kern/ipc_mig.c
@@ -651,12 +651,12 @@ syscall_vm_map(
        } else
                port = (ipc_port_t) memory_object;
 
-       copyin((char *)address, (char *)&addr, sizeof(vm_offset_t));
+       copyin(address, (void *)&addr, sizeof(vm_offset_t));
        result = vm_map(map, &addr, size, mask, anywhere,
                        port, offset, copy,
                        cur_protection, max_protection, inheritance);
        if (result == KERN_SUCCESS)
-               copyout((char *)&addr, (char *)address, sizeof(vm_offset_t));
+               copyout((void *)&addr, address, sizeof(vm_offset_t));
        if (IP_VALID(port))
                ipc_port_release_send(port);
        vm_map_deallocate(map);
@@ -678,10 +678,10 @@ kern_return_t syscall_vm_allocate(target_map, address, 
size, anywhere)
        if (map == VM_MAP_NULL)
                return MACH_SEND_INTERRUPTED;
 
-       copyin((char *)address, (char *)&addr, sizeof(vm_offset_t));
+       copyin(address, (void *)&addr, sizeof(vm_offset_t));
        result = vm_allocate(map, &addr, size, anywhere);
        if (result == KERN_SUCCESS)
-               copyout((char *)&addr, (char *)address, sizeof(vm_offset_t));
+               copyout((void *)&addr, address, sizeof(vm_offset_t));
        vm_map_deallocate(map);
 
        return result;
@@ -726,7 +726,7 @@ kern_return_t syscall_task_create(parent_task, 
inherit_memory, child_task)
                (void) ipc_kmsg_copyout_object(current_space(),
                                               (ipc_object_t) port,
                                               MACH_MSG_TYPE_PORT_SEND, &name);
-               copyout((char *)&name, (char *)child_task,
+               copyout((void *)&name, child_task,
                        sizeof(mach_port_t));
        }
        task_deallocate(t);
@@ -814,7 +814,7 @@ syscall_mach_port_allocate(task, right, namep)
 
        kr = mach_port_allocate(space, right, &name);
        if (kr == KERN_SUCCESS)
-               copyout((char *)&name, (char *)namep, sizeof(mach_port_t));
+               copyout((void *)&name, namep, sizeof(mach_port_t));
        is_release(space);
 
        return kr;
diff --git a/kern/time_stamp.c b/kern/time_stamp.c
index 9adfc14..f5742de 100644
--- a/kern/time_stamp.c
+++ b/kern/time_stamp.c
@@ -43,8 +43,8 @@ struct        tsval   *tsp;
        time_value_t temp;
        temp = time;
 
-       if (copyout((char *)&temp,
-                   (char *)tsp,
+       if (copyout((void *)&temp,
+                   tsp,
                    sizeof(struct tsval)) != KERN_SUCCESS)
            return(KERN_INVALID_ADDRESS);
        return(KERN_SUCCESS);
-- 
1.8.1.4