From f167a7b8c8aaa0f5522303566a5b48d4d89782ef Mon Sep 17 00:00:00 2001 From: Marin Ramesa Date: Wed, 11 Dec 2013 00:01:34 +0100 Subject: Cleanup of the memcpy(), memmove(), memcmp() and memset() calls 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. --- kern/host.c | 2 +- kern/xpr.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'kern') 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; -- cgit v1.2.3