[PATCH 1/3] Cleanup of the memcpy(), memmove(), memcmp() and memset() calls

[Marin Ramesa]

Addresses were cast to (void *). Pointers uncasted.

* device/ds_routines.c (ds_read_done) (memset) (start_sent): Cast to (void *) 
instead to (char *). Argument is an address.
(ds_read_done) (memset) (end_data): Likewise.
* i386/i386/pcb.c (thread_getstatus) (memcpy) (pm): Don't cast. Argument is a 
pointer.
(thread_getstatus) (memcpy) (iopb): Likewise.
* i386/i386at/immc.c (immc_cnputc) (memmove): Cast first argument to (void *). 
Argument is an address.
(immc_cnputc) (memmove): Cast second argument to (void *). Argument is an 
address.
(immc_cnputc) (memset): Cast first argument to (void *). Argument is an address.
* i386/i386at/model_dep.c (i386at_init) (memcpy) (phystokv): Cast to (void *) 
instead to (char *). Argument is an address.
* i386/intel/pmap.c (pmap_init) (memset) (addr): Likewise.
* ipc/mach_debug.c (mach_port_space_info) (memset) (table_addr + size_used): 
Likewise.
(mach_port_space_info) (memset) (tree_addr + size_used): Likewise.
* kern/host.c (host_processor_sets) (memcpy) (newaddr): Likewise.
(host_processor_sets) (memcpy) (addr): Likewise.
* kern/xpr.c (xprbootstrap) (memset) (addr): Likewise.
* vm/vm_debug.c (mach_vm_object_pages) (memset) (addr + size_used): Likewise.

---
 device/ds_routines.c    | 4 ++--
 i386/i386/pcb.c         | 4 ++--
 i386/i386at/immc.c      | 4 ++--
 i386/i386at/model_dep.c | 2 +-
 i386/intel/pmap.c       | 2 +-
 ipc/mach_debug.c        | 4 ++--
 kern/host.c             | 2 +-
 kern/xpr.c              | 2 +-
 vm/vm_debug.c           | 2 +-
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/device/ds_routines.c b/device/ds_routines.c
index ee575e5..d62be2b 100644
--- a/device/ds_routines.c
+++ b/device/ds_routines.c
@@ -1274,9 +1274,9 @@ boolean_t ds_read_done(ior)
         * Zero memory that the device did not fill.
         */
        if (start_sent < start_data)
-           memset((char *)start_sent, 0, start_data - start_sent);
+           memset((void *)start_sent, 0, start_data - start_sent);
        if (end_sent > end_data)
-           memset((char *)end_data, 0, end_sent - end_data);
+           memset((void *)end_data, 0, end_sent - end_data);
 
 
        /*
diff --git a/i386/i386/pcb.c b/i386/i386/pcb.c
index 02627ae..3827f5e 100644
--- a/i386/i386/pcb.c
+++ b/i386/i386/pcb.c
@@ -748,8 +748,8 @@ kern_return_t thread_getstatus(thread, flavor, tstate, 
count)
                if (thread->task->machine.iopb == 0)
                  memset (state->pm, 0xff, sizeof state->pm);
                else
-                 memcpy((char *) state->pm,
-                        (char *) thread->task->machine.iopb,
+                 memcpy(state->pm,
+                        thread->task->machine.iopb,
                         sizeof state->pm);
                simple_unlock (&thread->task->machine.iopb_lock);
 
diff --git a/i386/i386at/immc.c b/i386/i386at/immc.c
index b85eb07..e0837f2 100644
--- a/i386/i386at/immc.c
+++ b/i386/i386at/immc.c
@@ -49,8 +49,8 @@ immc_cnputc(unsigned char c)
        }
        else if (c == '\n')
        {
-               memmove(0xb8000, 0xb8000+80*2, 80*2*24);
-               memset(0xb8000+80*2*24, 0, 80*2);
+               memmove((void *)0xb8000, (void *)0xb8000+80*2, 80*2*24);
+               memset((void *)(0xb8000+80*2*24), 0, 80*2);
                ofs = 0;
        }
        else
diff --git a/i386/i386at/model_dep.c b/i386/i386at/model_dep.c
index 93aa87d..5015d41 100644
--- a/i386/i386at/model_dep.c
+++ b/i386/i386at/model_dep.c
@@ -369,7 +369,7 @@ i386at_init(void)
                int len = strlen ((char*)phystokv(boot_info.cmdline)) + 1;
                assert(init_alloc_aligned(round_page(len), &addr));
                kernel_cmdline = (char*) phystokv(addr);
-               memcpy(kernel_cmdline, (char*)phystokv(boot_info.cmdline), len);
+               memcpy(kernel_cmdline, (void *)phystokv(boot_info.cmdline), 
len);
                boot_info.cmdline = addr;
        }
 
diff --git a/i386/intel/pmap.c b/i386/intel/pmap.c
index 2f1c538..ff6a327 100644
--- a/i386/intel/pmap.c
+++ b/i386/intel/pmap.c
@@ -919,7 +919,7 @@ void pmap_init()
        s = round_page(s);
        if (kmem_alloc_wired(kernel_map, &addr, s) != KERN_SUCCESS)
                panic("pmap_init");
-       memset((char *) addr, 0, s);
+       memset((void *) addr, 0, s);
 
        /*
         *      Allocate the structures first to preserve word-alignment.
diff --git a/ipc/mach_debug.c b/ipc/mach_debug.c
index 28dd693..5c93cfd 100644
--- a/ipc/mach_debug.c
+++ b/ipc/mach_debug.c
@@ -447,7 +447,7 @@ mach_port_space_info(
                                  table_size - rsize_used);
 
                if (size_used != rsize_used)
-                       memset((char *) (table_addr + size_used), 0, 
+                       memset((void *) (table_addr + size_used), 0, 
                              rsize_used - size_used);
 
                kr = vm_map_copyin(ipc_kernel_map, table_addr, rsize_used,
@@ -482,7 +482,7 @@ mach_port_space_info(
                                  tree_size - rsize_used);
 
                if (size_used != rsize_used)
-                       memset((char *) (tree_addr + size_used), 0, 
+                       memset((void *) (tree_addr + size_used), 0, 
                              rsize_used - size_used);
 
                kr = vm_map_copyin(ipc_kernel_map, tree_addr, rsize_used,
diff --git a/kern/host.c b/kern/host.c
index 773697c..698acea 100644
--- a/kern/host.c
+++ b/kern/host.c
@@ -302,7 +302,7 @@ host_processor_sets(
                        return KERN_RESOURCE_SHORTAGE;
                }
 
-               memcpy((char *) newaddr, (char *) addr, size_needed);
+               memcpy((void *) newaddr, (void *) addr, size_needed);
                kfree(addr, size);
                psets = (processor_set_t *) newaddr;
        }
diff --git a/kern/xpr.c b/kern/xpr.c
index 92b253c..a62472d 100644
--- a/kern/xpr.c
+++ b/kern/xpr.c
@@ -115,7 +115,7 @@ void xprbootstrap(void)
                 *      the previous buffer contents.
                 */
 
-               memset((char *) addr, 0, size);
+               memset((void *) addr, 0, size);
        }
 
        xprbase = (struct xprbuf *) addr;
diff --git a/vm/vm_debug.c b/vm/vm_debug.c
index 0af58b6..bc2cab4 100644
--- a/vm/vm_debug.c
+++ b/vm/vm_debug.c
@@ -404,7 +404,7 @@ mach_vm_object_pages(object, pagesp, countp)
                                  addr + rsize_used, size - rsize_used);
 
                if (size_used != rsize_used)
-                       memset((char *) (addr + size_used), 0, 
+                       memset((void *) (addr + size_used), 0, 
                               rsize_used - size_used);
 
                kr = vm_map_copyin(ipc_kernel_map, addr, rsize_used,
-- 
1.8.1.4