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. --- i386/i386/pcb.c | 4 ++-- i386/i386at/immc.c | 4 ++-- i386/i386at/model_dep.c | 2 +- i386/intel/pmap.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'i386') 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. -- cgit v1.2.3