? autom4te.cache Index: device/cirbuf.c =================================================================== RCS file: /cvsroot/hurd/gnumach/device/Attic/cirbuf.c,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 cirbuf.c --- device/cirbuf.c 25 Feb 1997 21:28:13 -0000 1.1.1.1 +++ device/cirbuf.c 5 Nov 2006 16:42:02 -0000 @@ -30,11 +30,11 @@ * Circular buffers for TTY */ +#include + #include #include - - /* read at c_cf, write at c_cl */ /* if c_cf == c_cl, buffer is empty */ /* if c_cl == c_cf - 1, buffer is full */ @@ -143,7 +143,7 @@ i = cb->c_cl - cb->c_cf; if (i > count) i = count; - bcopy(cb->c_cf, cp, i); + memcpy(cp, cb->c_cf, i); cp += i; count -= i; cb->c_cf += i; @@ -184,7 +184,7 @@ if (i > count) i = count; - bcopy(cp, cb->c_cl, i); + memcpy(cp, cb->c_cl, i); cp += i; count -= i; cb->c_cc += i; Index: device/cons.c =================================================================== RCS file: /cvsroot/hurd/gnumach/device/Attic/cons.c,v retrieving revision 1.2.4.1 diff -u -r1.2.4.1 cons.c --- device/cons.c 15 Oct 2006 14:59:03 -0000 1.2.4.1 +++ device/cons.c 5 Nov 2006 16:42:02 -0000 @@ -37,6 +37,8 @@ #include #endif +#include + #ifdef MACH_KMSG #include #include @@ -56,7 +58,7 @@ * in the bootstrap procedure. */ int (*romgetc)() = 0; -void (*romputc)() = 0; +void (*romputc)() = 0; #if CONSBUFSIZE > 0 /* @@ -268,7 +270,7 @@ if (consbufused == 0) { consbp = consbuf; consbufused = 1; - bzero(consbuf, CONSBUFSIZE); + memset(consbuf, 0, CONSBUFSIZE); } *consbp++ = c; if (consbp >= &consbuf[CONSBUFSIZE]) Index: device/dev_pager.c =================================================================== RCS file: /cvsroot/hurd/gnumach/device/dev_pager.c,v retrieving revision 1.3.2.1 diff -u -r1.3.2.1 dev_pager.c --- device/dev_pager.c 20 Mar 2006 11:31:35 -0000 1.3.2.1 +++ device/dev_pager.c 5 Nov 2006 16:42:02 -0000 @@ -51,6 +51,8 @@ #include #include +#include + extern vm_offset_t block_io_mmap(); /* dummy routine to allow mmap for block devices */ @@ -424,8 +426,8 @@ if (ior->io_residual) { if (device_pager_debug) printf("(device_pager)data_request_done: r: 0x%x\n",ior->io_residual); - bzero( (char *) (&ior->io_data[ior->io_count - - ior->io_residual]), + memset( (char *) (&ior->io_data[ior->io_count - + ior->io_residual]), 0, (unsigned) ior->io_residual); } } else { Index: device/ds_routines.c =================================================================== RCS file: /cvsroot/hurd/gnumach/device/Attic/ds_routines.c,v retrieving revision 1.6.2.2 diff -u -r1.6.2.2 ds_routines.c --- device/ds_routines.c 15 Oct 2006 14:59:03 -0000 1.6.2.2 +++ device/ds_routines.c 5 Nov 2006 16:42:03 -0000 @@ -28,6 +28,8 @@ * Date: 3/89 */ +#include + #include #include #include @@ -618,7 +620,7 @@ if (ior->io_op & IO_INBAND) { assert(ior->io_count <= sizeof (io_buf_ptr_inband_t)); new_addr = zalloc(io_inband_zone); - bcopy((void*)ior->io_data, (void*)new_addr, ior->io_count); + memcpy((void*)new_addr, (void*)ior->io_data, ior->io_count); ior->io_data = (io_buf_ptr_t)new_addr; ior->io_alloc_size = sizeof (io_buf_ptr_inband_t); @@ -1083,9 +1085,9 @@ * Zero memory that the device did not fill. */ if (start_sent < start_data) - bzero((char *)start_sent, start_data - start_sent); + memset((char *)start_sent, 0, start_data - start_sent); if (end_sent > end_data) - bzero((char *)end_data, end_sent - end_data); + memset((char *)end_data, 0, end_sent - end_data); /* Index: device/kmsg.c =================================================================== RCS file: /cvsroot/hurd/gnumach/device/Attic/kmsg.c,v retrieving revision 1.1.4.1 diff -u -r1.1.4.1 kmsg.c --- device/kmsg.c 15 Oct 2006 14:59:03 -0000 1.1.4.1 +++ device/kmsg.c 5 Nov 2006 16:42:03 -0000 @@ -24,7 +24,7 @@ #include #include #include - +#include #define KMSGBUFSIZE (4096) /* XXX */ Index: device/net_io.c =================================================================== RCS file: /cvsroot/hurd/gnumach/device/net_io.c,v retrieving revision 1.2.2.5 diff -u -r1.2.2.5 net_io.c --- device/net_io.c 15 Oct 2006 14:59:03 -0000 1.2.2.5 +++ device/net_io.c 5 Nov 2006 16:42:03 -0000 @@ -38,6 +38,7 @@ * It may change a lot real soon. -cmaeda 11 June 1993 */ +#include #include #include #include /* spl definitions */ @@ -805,13 +806,13 @@ break; } - bcopy( - net_kmsg(kmsg)->packet, + memcpy( net_kmsg(new_kmsg)->packet, + net_kmsg(kmsg)->packet, ret_count); - bcopy( - net_kmsg(kmsg)->header, + memcpy( net_kmsg(new_kmsg)->header, + net_kmsg(kmsg)->header, NET_HDW_HDR_MAX); } net_kmsg(new_kmsg)->net_rcv_msg_packet_count = ret_count; @@ -1297,7 +1298,7 @@ my_infp->rcv_count = 0; /* Copy filter program. */ - bcopy ((vm_offset_t)filter, (vm_offset_t)my_infp->filter, + memcpy ((void *)(vm_offset_t)my_infp->filter, (const void *)filter, filter_bytes); my_infp->filter_end = (filter_t *)((char *)my_infp->filter + filter_bytes); @@ -1410,12 +1411,11 @@ return (D_INVALID_OPERATION); } - bcopy((char *)ifp->if_address, - (char *)status, - (unsigned) addr_byte_count); + memcpy(status, ifp->if_address, + addr_byte_count); if (addr_byte_count < addr_int_count * sizeof(int)) - bzero((char *)status + addr_byte_count, - (unsigned) (addr_int_count * sizeof(int) + memset(status + addr_byte_count, 0, + (addr_int_count * sizeof(int) - addr_byte_count)); for (i = 0; i < addr_int_count; i++) { Index: i386/i386/fpu.c =================================================================== RCS file: /cvsroot/hurd/gnumach/i386/i386/fpu.c,v retrieving revision 1.2.4.2 diff -u -r1.2.4.2 fpu.c --- i386/i386/fpu.c 4 Nov 2006 23:32:21 -0000 1.2.4.2 +++ i386/i386/fpu.c 5 Nov 2006 16:42:08 -0000 @@ -39,6 +39,7 @@ #include #include #include "cpu_number.h" +#include #if 0 #include @@ -262,7 +263,7 @@ /* * Ensure that reserved parts of the environment are 0. */ - bzero((char *)&ifps->fp_save_state, sizeof(struct i386_fp_save)); + memset((char *)&ifps->fp_save_state, 0, sizeof(struct i386_fp_save)); ifps->fp_save_state.fp_control = user_fp_state->fp_control; ifps->fp_save_state.fp_status = user_fp_state->fp_status; @@ -290,13 +291,13 @@ >> FPS_TOS_SHIFT; /* physical register for st(0) */ if (i == 0) - bcopy(src, dst, 8 * 10); + memcpy(dst, src, 8 * 10); else { - bcopy(src, - dst + 10 * i, + memcpy(dst + 10 * i, + src, 10 * (8 - i)); - bcopy(src + 10 * (8 - i), - dst, + memcpy(dst, + src + 10 * (8 - i), 10 * i); } } @@ -339,7 +340,7 @@ * No valid floating-point state. */ simple_unlock(&pcb->lock); - bzero((char *)state, sizeof(struct i386_float_state)); + memset((char *)state, 0, sizeof(struct i386_float_state)); return KERN_SUCCESS; } @@ -372,7 +373,7 @@ /* * Ensure that reserved parts of the environment are 0. */ - bzero((char *)user_fp_state, sizeof(struct i386_fp_save)); + memset((char *)user_fp_state, 0, sizeof(struct i386_fp_save)); user_fp_state->fp_control = ifps->fp_save_state.fp_control; user_fp_state->fp_status = ifps->fp_save_state.fp_status; @@ -400,13 +401,13 @@ >> FPS_TOS_SHIFT; /* physical register for st(0) */ if (i == 0) - bcopy(src, dst, 8 * 10); + memcpy(dst, src, 8 * 10); else { - bcopy(src + 10 * i, - dst, + memcpy(dst, + src + 10 * i, 10 * (8 - i)); - bcopy(src, - dst + 10 * (8 - i), + memcpy(dst + 10 * (8 - i), + src, 10 * i); } } @@ -635,7 +636,7 @@ ifps = pcb->ims.ifps; if (ifps == 0) { ifps = (struct i386_fpsave_state *) zalloc(ifps_zone); - bzero(ifps, sizeof *ifps); + memset(ifps, 0, sizeof *ifps); pcb->ims.ifps = ifps; fpinit(); #if 1 @@ -681,7 +682,7 @@ struct i386_fpsave_state *ifps; ifps = (struct i386_fpsave_state *)zalloc(ifps_zone); - bzero(ifps, sizeof *ifps); + memset(ifps, 0, sizeof *ifps); pcb->ims.ifps = ifps; ifps->fp_valid = TRUE; Index: i386/i386/iopb.c =================================================================== RCS file: /cvsroot/hurd/gnumach/i386/i386/Attic/iopb.c,v retrieving revision 1.1.1.1.4.1 diff -u -r1.1.1.1.4.1 iopb.c --- i386/i386/iopb.c 4 Mar 2006 20:39:11 -0000 1.1.1.1.4.1 +++ i386/i386/iopb.c 5 Nov 2006 16:42:08 -0000 @@ -27,6 +27,8 @@ * Code to manipulate IO permission bitmaps. */ +#include + #include #include @@ -246,7 +248,7 @@ vm_offset_t addr = kvtolin (io_tss); vm_size_t limit = (char *)&io_tss->barrier - (char *)io_tss; - bzero(&io_tss->tss, sizeof(struct i386_tss)); + memset(&io_tss->tss, 0, sizeof(struct i386_tss)); io_tss->tss.io_bit_map_offset = (char *)&io_tss->bitmap - (char *)io_tss; io_tss->tss.ss0 = KERNEL_DS; @@ -560,7 +562,7 @@ return KERN_RESOURCE_SHORTAGE; } - bcopy((void *)addr, (void *)new_addr, size_needed); + memcpy((void *)new_addr, (const void *)addr, size_needed); kfree(addr, size); devices = (mach_device_t *)new_addr; } Index: i386/i386/mp_desc.c =================================================================== RCS file: /cvsroot/hurd/gnumach/i386/i386/mp_desc.c,v retrieving revision 1.1.1.1.4.1 diff -u -r1.1.1.1.4.1 mp_desc.c --- i386/i386/mp_desc.c 15 Oct 2006 14:59:03 -0000 1.1.1.1.4.1 +++ i386/i386/mp_desc.c 5 Nov 2006 16:42:08 -0000 @@ -24,6 +24,8 @@ * the rights to redistribute these changes. */ +#include + #if NCPUS > 1 #include @@ -127,16 +129,16 @@ /* * Copy the tables */ - bcopy((char *)idt, - (char *)mpt->idt, + memcpy(mpt->idt, + idt, sizeof(idt)); - bcopy((char *)gdt, - (char *)mpt->gdt, + memcpy(mpt->gdt, + gdt, sizeof(gdt)); - bcopy((char *)ldt, - (char *)mpt->ldt, + memcpy(mpt->ldt, + ldt, sizeof(ldt)); - bzero((char *)&mpt->ktss, + memset(&mpt->ktss, 0, sizeof(struct i386_tss)); /* Index: i386/i386/pcb.c =================================================================== RCS file: /cvsroot/hurd/gnumach/i386/i386/pcb.c,v retrieving revision 1.2.4.1 diff -u -r1.2.4.1 pcb.c --- i386/i386/pcb.c 15 Oct 2006 14:59:03 -0000 1.2.4.1 +++ i386/i386/pcb.c 5 Nov 2006 16:42:08 -0000 @@ -24,6 +24,8 @@ * the rights to redistribute these changes. */ +#include + #include #include #include @@ -324,7 +326,7 @@ /* * We can't let random values leak out to the user. */ - bzero((char *) pcb, sizeof *pcb); + memset((char *) pcb, 0, sizeof *pcb); simple_lock_init(&pcb->lock); /* @@ -523,8 +525,8 @@ thread->pcb->ims.io_tss = tss; } - bcopy((char *) state->pm, - (char *) tss->bitmap, + memcpy(tss->bitmap, + state->pm, sizeof state->pm); #endif break; @@ -684,8 +686,8 @@ * The thread has its own ktss. */ - bcopy((char *) tss->bitmap, - (char *) state->pm, + memcpy(state->pm, + tss->bitmap, sizeof state->pm); } Index: i386/i386/phys.c =================================================================== RCS file: /cvsroot/hurd/gnumach/i386/i386/phys.c,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 phys.c --- i386/i386/phys.c 25 Feb 1997 21:27:11 -0000 1.1.1.1 +++ i386/i386/phys.c 5 Nov 2006 16:42:08 -0000 @@ -24,6 +24,8 @@ * the rights to redistribute these changes. */ +#include + #include #include #include @@ -43,7 +45,7 @@ vm_offset_t p; { assert(p != vm_page_fictitious_addr); - bzero(phystokv(p), PAGE_SIZE); + memset((void *)phystokv(p), 0, PAGE_SIZE); } /* @@ -55,7 +57,7 @@ assert(src != vm_page_fictitious_addr); assert(dst != vm_page_fictitious_addr); - bcopy(phystokv(src), phystokv(dst), PAGE_SIZE); + memcpy((void *)phystokv(dst), (const void *)phystokv(src), PAGE_SIZE); } /* @@ -68,7 +70,7 @@ int count; { assert(dst_addr_p != vm_page_fictitious_addr); - bcopy(src_addr_v, phystokv(dst_addr_p), count); + memcpy((void *)phystokv(dst_addr_p), (const void *)src_addr_v, count); } /* @@ -82,7 +84,7 @@ int count; { assert(src_addr_p != vm_page_fictitious_addr); - bcopy(phystokv(src_addr_p), dst_addr_v, count); + memcpy((void *)dst_addr_v, (const void *)phystokv(src_addr_p), count); } /* Index: i386/i386/trap.c =================================================================== RCS file: /cvsroot/hurd/gnumach/i386/i386/trap.c,v retrieving revision 1.5.2.1 diff -u -r1.5.2.1 trap.c --- i386/i386/trap.c 15 Oct 2006 14:59:04 -0000 1.5.2.1 +++ i386/i386/trap.c 5 Nov 2006 16:42:09 -0000 @@ -27,6 +27,8 @@ * Hardware trap/fault handler. */ +#include + #include #include #include @@ -940,8 +942,8 @@ #ifdef gcc_1_36_worked int_vec = ((struct int_vec *)0)[vec]; #else - bcopy((char *) (sizeof(struct int_vec) * vec), - (char *)&int_vec, + memcpy(&int_vec, + (const void *)(sizeof(struct int_vec) * vec), sizeof (struct int_vec)); #endif if (copyout((char *)&iret_16, Index: i386/i386/user_ldt.c =================================================================== RCS file: /cvsroot/hurd/gnumach/i386/i386/user_ldt.c,v retrieving revision 1.2.4.1 diff -u -r1.2.4.1 user_ldt.c --- i386/i386/user_ldt.c 26 Jan 2006 14:53:56 -0000 1.2.4.1 +++ i386/i386/user_ldt.c 5 Nov 2006 16:42:09 -0000 @@ -28,6 +28,8 @@ * Each thread in a task may have its own LDT. */ +#include + #include #include @@ -221,8 +223,8 @@ * from old to new. Otherwise copy the default ldt. */ if (old_ldt) { - bcopy((char *)&old_ldt->ldt[0], - (char *)&new_ldt->ldt[0], + memcpy(&new_ldt->ldt[0], + &old_ldt->ldt[0], old_ldt->desc.limit_low + 1); } else { @@ -253,8 +255,8 @@ /* * Install new descriptors. */ - bcopy((char *)desc_list, - (char *)&old_ldt->ldt[first_desc], + memcpy(&old_ldt->ldt[first_desc], + desc_list, count * sizeof(struct real_descriptor)); simple_unlock(&pcb->lock); @@ -355,8 +357,8 @@ /* * copy out the descriptors */ - bcopy((char *)&user_ldt->ldt[first_desc], - (char *)*desc_list, + memcpy(*desc_list, + &user_ldt->ldt[first_desc], ldt_size); *count = ldt_count; simple_unlock(&pcb->lock); @@ -378,7 +380,7 @@ */ size_left = size_used - ldt_size; if (size_left > 0) - bzero((char *)addr + ldt_size, size_left); + memset((char *)addr + ldt_size, 0, size_left); /* * Make memory into copyin form - this unwires it. Index: i386/i386at/immc.c =================================================================== RCS file: /cvsroot/hurd/gnumach/i386/i386at/Attic/immc.c,v retrieving revision 1.2 diff -u -r1.2 immc.c --- i386/i386at/immc.c 5 Apr 2001 06:39:21 -0000 1.2 +++ i386/i386at/immc.c 5 Nov 2006 16:42:09 -0000 @@ -21,6 +21,8 @@ * Author: Bryan Ford, University of Utah CSL */ +#include + #ifdef ENABLE_IMMEDIATE_CONSOLE /* This is a special "feature" (read: kludge) @@ -47,8 +49,8 @@ } else if (c == '\n') { - bcopy(0xb8000+80*2, 0xb8000, 80*2*24); - bzero(0xb8000+80*2*24, 80*2); + memcpy(0xb8000, 0xb8000+80*2, 80*2*24); + memset(0xb8000+80*2*24, 0, 80*2); ofs = 0; } else Index: i386/i386at/kd_event.c =================================================================== RCS file: /cvsroot/hurd/gnumach/i386/i386at/Attic/kd_event.c,v retrieving revision 1.3.2.1 diff -u -r1.3.2.1 kd_event.c --- i386/i386at/kd_event.c 2 Feb 2004 21:44:40 -0000 1.3.2.1 +++ i386/i386at/kd_event.c 5 Nov 2006 16:42:09 -0000 @@ -54,6 +54,8 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include + #include #include #ifdef MACH_KERNEL @@ -532,7 +534,7 @@ if (count * sizeof X_kdb_enter_str[0] > sizeof X_kdb_enter_str) return D_INVALID_OPERATION; - bcopy(data, X_kdb_enter_str, count * sizeof X_kdb_enter_str[0]); + memcpy(X_kdb_enter_str, data, count * sizeof X_kdb_enter_str[0]); X_kdb_enter_len = count; return D_SUCCESS; } @@ -545,7 +547,7 @@ if (count * sizeof X_kdb_exit_str[0] > sizeof X_kdb_exit_str) return D_INVALID_OPERATION; - bcopy(data, X_kdb_exit_str, count * sizeof X_kdb_exit_str[0]); + memcpy(X_kdb_exit_str, data, count * sizeof X_kdb_exit_str[0]); X_kdb_exit_len = count; return D_SUCCESS; } Index: i386/intel/pmap.c =================================================================== RCS file: /cvsroot/hurd/gnumach/i386/intel/pmap.c,v retrieving revision 1.4.2.3 diff -u -r1.4.2.3 pmap.c --- i386/intel/pmap.c 4 Nov 2006 23:59:11 -0000 1.4.2.3 +++ i386/intel/pmap.c 5 Nov 2006 16:42:09 -0000 @@ -55,6 +55,8 @@ * and to when physical maps must be made correct. */ +#include + #include #include @@ -715,7 +717,7 @@ s = round_page(s); if (kmem_alloc_wired(kernel_map, &addr, s) != KERN_SUCCESS) panic("pmap_init"); - bzero((char *) addr, s); + memset((char *) addr, 0, s); /* * Allocate the structures first to preserve word-alignment. @@ -829,7 +831,7 @@ /* * Zero the page. */ - bzero(phystokv(pa), PAGE_SIZE); + memset((void *)phystokv(pa), 0, PAGE_SIZE); return pa; } @@ -894,7 +896,7 @@ != KERN_SUCCESS) panic("pmap_create"); - bcopy(kernel_page_dir, p->dirbase, INTEL_PGBYTES); + memcpy(p->dirbase, kernel_page_dir, INTEL_PGBYTES); p->ref_count = 1; simple_lock_init(&p->lock); Index: include/string.h =================================================================== RCS file: include/string.h diff -N include/string.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ include/string.h 5 Nov 2006 16:42:10 -0000 @@ -0,0 +1,33 @@ +/* + * String Handling Functions. + * Copyright (C) 2006 Barry deFreese. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * String handling functions. + * + */ + +#ifndef _MACH_SA_SYS_STRING_H_ +#define _MACH_SA_SYS_STRING_H_ + +#include + +extern void *memcpy (void *dest, const void *src, size_t n); + +extern void *memset (void *s, int c, size_t n); + +#endif /* _MACH_SA_SYS_STRING_H_ */ Index: include/mach/mig_support.h =================================================================== RCS file: /cvsroot/hurd/gnumach/include/mach/mig_support.h,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 mig_support.h --- include/mach/mig_support.h 25 Feb 1997 21:26:52 -0000 1.1.1.1 +++ include/mach/mig_support.h 5 Nov 2006 16:42:10 -0000 @@ -37,12 +37,6 @@ #if defined(MACH_KERNEL) -#if defined(bcopy) -#else /* not defined(bcopy) */ -extern void bcopy(const void *, void *, vm_size_t); -#define memcpy(_dst,_src,_len) bcopy((_src),(_dst),(_len)) -#endif /* defined(bcopy) */ - #endif /* defined(MACH_KERNEL) */ extern void mig_init(void *_first); Index: ipc/ipc_entry.c =================================================================== RCS file: /cvsroot/hurd/gnumach/ipc/ipc_entry.c,v retrieving revision 1.2 diff -u -r1.2 ipc_entry.c --- ipc/ipc_entry.c 23 Apr 1997 18:40:54 -0000 1.2 +++ ipc/ipc_entry.c 5 Nov 2006 16:42:10 -0000 @@ -47,6 +47,7 @@ #include #include #include +#include zone_t ipc_tree_entry_zone; @@ -635,7 +636,7 @@ */ if (!it_entries_reallocable(oits)) - (void) memcpy((void *) table, (const void *) otable, + memcpy(table, otable, osize * sizeof(struct ipc_entry)); for (i = 0; i < osize; i++) Index: ipc/ipc_kmsg.c =================================================================== RCS file: /cvsroot/hurd/gnumach/ipc/ipc_kmsg.c,v retrieving revision 1.2.2.2 diff -u -r1.2.2.2 ipc_kmsg.c --- ipc/ipc_kmsg.c 15 Oct 2006 14:59:04 -0000 1.2.2.2 +++ ipc/ipc_kmsg.c 5 Nov 2006 16:42:11 -0000 @@ -55,6 +55,7 @@ #include #include +#include extern int copyinmap(); extern int copyoutmap(); @@ -558,7 +559,7 @@ return MACH_SEND_NO_BUFFER; ikm_init(kmsg, size); - bcopy((char *) msg, (char *) &kmsg->ikm_header, size); + memcpy(&kmsg->ikm_header, msg, size); kmsg->ikm_header.msgh_size = size; *kmsgp = kmsg; @@ -623,7 +624,7 @@ assert(!KMSG_IN_DIPC(kmsg)); #endif /* DIPC */ - (void) memcpy((void *) msg, (const void *) &kmsg->ikm_header, size); + memcpy(msg, &kmsg->ikm_header, size); ikm_free(kmsg); } Index: ipc/ipc_object.c =================================================================== RCS file: /cvsroot/hurd/gnumach/ipc/ipc_object.c,v retrieving revision 1.3.2.1 diff -u -r1.3.2.1 ipc_object.c --- ipc/ipc_object.c 15 Oct 2006 14:59:04 -0000 1.3.2.1 +++ ipc/ipc_object.c 5 Nov 2006 16:42:11 -0000 @@ -31,6 +31,8 @@ * Functions to manipulate IPC objects. */ +#include + #include #include #include @@ -239,11 +241,11 @@ if (otype == IOT_PORT) { ipc_port_t port = (ipc_port_t)object; - bzero((char *)port, sizeof(*port)); + memset((char *)port, 0, sizeof(*port)); } else if (otype == IOT_PORT_SET) { ipc_pset_t pset = (ipc_pset_t)object; - bzero((char *)pset, sizeof(*pset)); + memset((char *)pset, 0, sizeof(*pset)); } kr = ipc_entry_alloc(space, namep, &entry); if (kr != KERN_SUCCESS) { @@ -305,11 +307,11 @@ if (otype == IOT_PORT) { ipc_port_t port = (ipc_port_t)object; - bzero((char *)port, sizeof(*port)); + memset((char *)port, 0, sizeof(*port)); } else if (otype == IOT_PORT_SET) { ipc_pset_t pset = (ipc_pset_t)object; - bzero((char *)pset, sizeof(*pset)); + memset((char *)pset, 0, sizeof(*pset)); } kr = ipc_entry_alloc_name(space, name, &entry); Index: ipc/ipc_port.c =================================================================== RCS file: /cvsroot/hurd/gnumach/ipc/ipc_port.c,v retrieving revision 1.2.2.2 diff -u -r1.2.2.2 ipc_port.c --- ipc/ipc_port.c 15 Oct 2006 14:59:04 -0000 1.2.2.2 +++ ipc/ipc_port.c 5 Nov 2006 16:42:12 -0000 @@ -34,6 +34,8 @@ * Functions to manipulate IPC ports. */ +#include + #include #include #include @@ -182,7 +184,7 @@ osize = oits->its_size; free = otable->ipr_next; - bcopy((char *)(otable + 1), (char *)(ntable + 1), + memcpy((ntable + 1), (otable + 1), (osize - 1) * sizeof(struct ipc_port_request)); } else { osize = 1; Index: ipc/ipc_space.c =================================================================== RCS file: /cvsroot/hurd/gnumach/ipc/ipc_space.c,v retrieving revision 1.2.2.2 diff -u -r1.2.2.2 ipc_space.c --- ipc/ipc_space.c 15 Oct 2006 14:59:04 -0000 1.2.2.2 +++ ipc/ipc_space.c 5 Nov 2006 16:42:12 -0000 @@ -50,7 +50,7 @@ #include #include #include - +#include zone_t ipc_space_zone; Index: ipc/mach_debug.c =================================================================== RCS file: /cvsroot/hurd/gnumach/ipc/mach_debug.c,v retrieving revision 1.2.2.1 diff -u -r1.2.2.1 mach_debug.c --- ipc/mach_debug.c 15 Oct 2006 14:59:04 -0000 1.2.2.1 +++ ipc/mach_debug.c 5 Nov 2006 16:42:12 -0000 @@ -33,6 +33,8 @@ * Exported kernel calls. See mach_debug/mach_debug.defs. */ +#include + #include #include #include @@ -453,7 +455,7 @@ table_size - rsize_used); if (size_used != rsize_used) - bzero((char *) (table_addr + size_used), + memset((char *) (table_addr + size_used), 0, rsize_used - size_used); kr = vm_map_copyin(ipc_kernel_map, table_addr, rsize_used, @@ -488,7 +490,7 @@ tree_size - rsize_used); if (size_used != rsize_used) - bzero((char *) (tree_addr + size_used), + memset((char *) (tree_addr + size_used), 0, rsize_used - size_used); kr = vm_map_copyin(ipc_kernel_map, tree_addr, rsize_used, Index: kern/act.c =================================================================== RCS file: /cvsroot/hurd/gnumach/kern/act.c,v retrieving revision 1.2 diff -u -r1.2 act.c --- kern/act.c 5 Apr 2001 06:39:20 -0000 1.2 +++ kern/act.c 5 Nov 2006 16:42:12 -0000 @@ -24,6 +24,8 @@ * */ +#include + #ifdef MIGRATING_THREADS #include /* XXX */ @@ -113,7 +115,7 @@ /* XXX ipt_unlock(act_freelist); */ act->ipt_next = 0; #endif - bzero(act, sizeof(*act)); /*XXX shouldn't be needed */ + memset(act, 0, sizeof(*act)); /*XXX shouldn't be needed */ #ifdef DEBUG act->lower = act->higher = 0; Index: kern/boot_script.c =================================================================== RCS file: /cvsroot/hurd/gnumach/kern/boot_script.c,v retrieving revision 1.1 diff -u -r1.1 boot_script.c --- kern/boot_script.c 21 Aug 2001 04:19:34 -0000 1.1 +++ kern/boot_script.c 5 Nov 2006 16:42:12 -0000 @@ -3,9 +3,7 @@ /* Written by Shantanu Goel (goel@cs.columbia.edu). */ #include -#if !KERNEL || OSKIT_MACH #include -#endif #include "boot_script.h" Index: kern/bootstrap.c =================================================================== RCS file: /cvsroot/hurd/gnumach/kern/bootstrap.c,v retrieving revision 1.12.2.2 diff -u -r1.12.2.2 bootstrap.c --- kern/bootstrap.c 15 Oct 2006 14:59:04 -0000 1.12.2.2 +++ kern/bootstrap.c 5 Nov 2006 16:42:13 -0000 @@ -41,6 +41,7 @@ #include #include #include +#include #if MACH_KDB #include @@ -49,7 +50,6 @@ #if OSKIT_MACH #include -#include #include #include #include Index: kern/eventcount.c =================================================================== RCS file: /cvsroot/hurd/gnumach/kern/eventcount.c,v retrieving revision 1.1.1.1.4.1 diff -u -r1.1.1.1.4.1 eventcount.c --- kern/eventcount.c 15 Oct 2006 14:59:04 -0000 1.1.1.1.4.1 +++ kern/eventcount.c 5 Nov 2006 16:42:13 -0000 @@ -35,6 +35,8 @@ * */ +#include + #include #include #include "cpu_number.h" @@ -67,7 +69,7 @@ { int i; - bzero((char*)ev, sizeof(*ev)); + memset((char*)ev, 0, sizeof(*ev)); /* keep track of who is who */ for (i = 0; i < MAX_EVCS; i++) Index: kern/host.c =================================================================== RCS file: /cvsroot/hurd/gnumach/kern/host.c,v retrieving revision 1.1.1.1.4.1 diff -u -r1.1.1.1.4.1 host.c --- kern/host.c 15 Oct 2006 14:59:04 -0000 1.1.1.1.4.1 +++ kern/host.c 5 Nov 2006 16:42:13 -0000 @@ -29,6 +29,8 @@ * Non-ipc host functions. */ +#include + #include #include #include @@ -182,11 +184,11 @@ load_info = (host_load_info_t) info; - bcopy((char *) avenrun, - (char *) load_info->avenrun, + memcpy((char *) load_info->avenrun, + (char *) avenrun, sizeof avenrun); - bcopy((char *) mach_factor, - (char *) load_info->mach_factor, + memcpy((char *) load_info->mach_factor, + (char *) mach_factor, sizeof mach_factor); *count = HOST_LOAD_INFO_COUNT; @@ -302,7 +304,7 @@ return KERN_RESOURCE_SHORTAGE; } - bcopy((char *) addr, (char *) newaddr, size_needed); + memcpy((char *) newaddr, (char *) addr, size_needed); kfree(addr, size); psets = (processor_set_t *) newaddr; } Index: kern/lock.c =================================================================== RCS file: /cvsroot/hurd/gnumach/kern/lock.c,v retrieving revision 1.1.1.1.4.1 diff -u -r1.1.1.1.4.1 lock.c --- kern/lock.c 15 Oct 2006 14:59:04 -0000 1.1.1.1.4.1 +++ kern/lock.c 5 Nov 2006 16:42:13 -0000 @@ -34,6 +34,8 @@ * Locking primitives implementation */ +#include + #include #include #include @@ -219,7 +221,7 @@ lock_t l, boolean_t can_sleep) { - bzero((char *)l, sizeof(lock_data_t)); + memset((char *)l, 0, sizeof(lock_data_t)); simple_lock_init(&l->interlock); l->want_write = FALSE; l->want_upgrade = FALSE; Index: kern/lock_mon.c =================================================================== RCS file: /cvsroot/hurd/gnumach/kern/lock_mon.c,v retrieving revision 1.2.2.1 diff -u -r1.2.2.1 lock_mon.c --- kern/lock_mon.c 15 Oct 2006 14:59:04 -0000 1.2.2.1 +++ kern/lock_mon.c 5 Nov 2006 16:42:13 -0000 @@ -38,6 +38,8 @@ * Depending on hardware also records time spent with locks held */ +#include + #include #include #include @@ -263,10 +265,10 @@ for (bucket = 0; bucket < LOCK_INFO_HASH_COUNT; bucket++) { li = &lock_info[bucket].info[0]; for (i= 0; i< LOCK_INFO_PER_BUCKET; i++, li++) { - bzero(li, sizeof(struct lock_info)); + memset(li, 0, sizeof(struct lock_info)); } } - bzero(&default_lock_info, sizeof(struct lock_info)); + memset(&default_lock_info, 0, sizeof(struct lock_info)); } print_lock_info(li) Index: kern/mach_clock.c =================================================================== RCS file: /cvsroot/hurd/gnumach/kern/mach_clock.c,v retrieving revision 1.4.2.1 diff -u -r1.4.2.1 mach_clock.c --- kern/mach_clock.c 15 Oct 2006 14:59:04 -0000 1.4.2.1 +++ kern/mach_clock.c 5 Nov 2006 16:42:13 -0000 @@ -34,6 +34,8 @@ * Clock primitives. */ +#include + #include #include #include @@ -491,7 +493,7 @@ if (kmem_alloc_wired(kernel_map, (vm_offset_t *) &mtime, PAGE_SIZE) != KERN_SUCCESS) panic("mapable_time_init"); - bzero((char *)mtime, PAGE_SIZE); + memset((char *)mtime, 0, PAGE_SIZE); update_mapped_time(&time); } Index: kern/pc_sample.c =================================================================== RCS file: /cvsroot/hurd/gnumach/kern/pc_sample.c,v retrieving revision 1.1.1.1.4.1 diff -u -r1.1.1.1.4.1 pc_sample.c --- kern/pc_sample.c 15 Oct 2006 14:59:04 -0000 1.1.1.1.4.1 +++ kern/pc_sample.c 5 Nov 2006 16:42:13 -0000 @@ -24,6 +24,8 @@ * the rights to redistribute these changes. */ +#include + #include /* vm_address_t */ #include /* pointer_t */ #include @@ -174,18 +176,18 @@ * Simple case: no wraparound. * Copy from seqidx1 to seqidx2. */ - bcopy((sampled_pc_array_t)cp->buffer + seqidx1 + 1, - sampled_pcs_out, + memcpy(sampled_pcs_out, + (sampled_pc_array_t)cp->buffer + seqidx1 + 1, nsamples * sizeof(sampled_pc_t)); } else { /* seqidx1 > seqidx2 -- Handle wraparound. */ - bcopy((sampled_pc_array_t)cp->buffer + seqidx1 + 1, - sampled_pcs_out, + memcpy(sampled_pcs_out, + (sampled_pc_array_t)cp->buffer + seqidx1 + 1, (MAX_PC_SAMPLES - seqidx1 - 1) * sizeof(sampled_pc_t)); - bcopy((sampled_pc_array_t)cp->buffer, - sampled_pcs_out + (MAX_PC_SAMPLES - seqidx1 - 1), + memcpy(sampled_pcs_out + (MAX_PC_SAMPLES - seqidx1 - 1), + (sampled_pc_array_t)cp->buffer, (seqidx2 + 1) * sizeof(sampled_pc_t)); } } else { Index: kern/processor.c =================================================================== RCS file: /cvsroot/hurd/gnumach/kern/processor.c,v retrieving revision 1.2.2.1 diff -u -r1.2.2.1 processor.c --- kern/processor.c 15 Oct 2006 14:59:04 -0000 1.2.2.1 +++ kern/processor.c 5 Nov 2006 16:42:13 -0000 @@ -27,6 +27,8 @@ * processor.c: processor and processor_set manipulation routines. */ +#include + #include #include #include @@ -971,7 +973,7 @@ return KERN_RESOURCE_SHORTAGE; } - bcopy((char *) addr, (char *) newaddr, size_needed); + memcpy((void *)newaddr, (const void *)addr, size_needed); kfree(addr, size); addr = newaddr; } Index: kern/syscall_emulation.c =================================================================== RCS file: /cvsroot/hurd/gnumach/kern/syscall_emulation.c,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 syscall_emulation.c --- kern/syscall_emulation.c 25 Feb 1997 21:28:26 -0000 1.1.1.1 +++ kern/syscall_emulation.c 5 Nov 2006 16:42:14 -0000 @@ -24,6 +24,8 @@ * the rights to redistribute these changes. */ +#include + #include #include #include @@ -198,8 +200,8 @@ * Copy the entries to the new emulation vector, * deallocate the current one, and use the new one. */ - bcopy((char *)&cur_eml->disp_vector[0], - (char *)&new_eml->disp_vector[cur_start-new_start], + memcpy((void *)&new_eml->disp_vector[cur_start-new_start], + &cur_eml->disp_vector[0], cur_eml->disp_count * sizeof(vm_offset_t)); if (--cur_eml->ref_count == 0) @@ -258,7 +260,7 @@ new_size = count_to_size(new_end - new_start); new_eml = (eml_dispatch_t) kalloc(new_size); - bzero((char *)new_eml, new_size); + memset((char *)new_eml, 0, new_size); simple_lock_init(&new_eml->lock); new_eml->ref_count = 1; new_eml->disp_min = new_start; @@ -271,8 +273,8 @@ * We have the emulation vector. * Install the new emulation entries. */ - bcopy((char *)&emulation_vector[0], - (char *)&cur_eml->disp_vector[vector_start - cur_eml->disp_min], + memcpy(&cur_eml->disp_vector[vector_start - cur_eml->disp_min], + &emulation_vector[0], emulation_vector_count * sizeof(vm_offset_t)); task_unlock(task); @@ -417,8 +419,8 @@ */ *vector_start = eml->disp_min; *emulation_vector_count = eml->disp_count; - bcopy((char *)eml->disp_vector, - (char *)addr, + memcpy((void *)addr, + eml->disp_vector, vector_size); /* @@ -444,7 +446,7 @@ */ size_left = size_used - vector_size; if (size_left > 0) - bzero((char *)addr + vector_size, size_left); + memset((char *)addr + vector_size, 0, size_left); /* * Make memory into copyin form - this unwires it. @@ -495,7 +497,7 @@ *vector_start = eml->disp_min; *emulation_vector_count = eml->disp_count; - bcopy((char *)eml->disp_vector, (char *)emulation_vector, + memcpy(emulation_vector, eml->disp_vector, *emulation_vector_count * sizeof(vm_offset_t)); simple_unlock(&eml->lock); Index: kern/task.c =================================================================== RCS file: /cvsroot/hurd/gnumach/kern/task.c,v retrieving revision 1.3.4.3 diff -u -r1.3.4.3 task.c --- kern/task.c 15 Oct 2006 14:59:04 -0000 1.3.4.3 +++ kern/task.c 5 Nov 2006 16:42:14 -0000 @@ -31,6 +31,8 @@ * Task management primitives implementation. */ +#include + #include #include #include @@ -625,7 +627,7 @@ return KERN_RESOURCE_SHORTAGE; } - bcopy((char *) addr, (char *) newaddr, size_needed); + memcpy((void *)newaddr, (const void *)addr, size_needed); kfree(addr, size); threads = (thread_t *) newaddr; } Index: kern/xpr.c =================================================================== RCS file: /cvsroot/hurd/gnumach/kern/Attic/xpr.c,v retrieving revision 1.2.2.1 diff -u -r1.2.2.1 xpr.c --- kern/xpr.c 15 Oct 2006 14:59:04 -0000 1.2.2.1 +++ kern/xpr.c 5 Nov 2006 16:42:14 -0000 @@ -33,6 +33,7 @@ #include #include +#include /* * After a spontaneous reboot, it is desirable to look @@ -112,7 +113,7 @@ * the previous buffer contents. */ - bzero((char *) addr, size); + memset((char *) addr, 0, size); } xprbase = (struct xprbuf *) addr; Index: kern/zalloc.c =================================================================== RCS file: /cvsroot/hurd/gnumach/kern/zalloc.c,v retrieving revision 1.3.2.1 diff -u -r1.3.2.1 zalloc.c --- kern/zalloc.c 15 Oct 2006 14:59:04 -0000 1.3.2.1 +++ kern/zalloc.c 5 Nov 2006 16:42:14 -0000 @@ -34,6 +34,8 @@ * data blocks for which quick allocation/deallocation is possible. */ +#include + #include #include #include @@ -942,7 +944,7 @@ used = max_zones * sizeof *names; if (used != names_size) - bzero((char *) (names_addr + used), names_size - used); + memset((char *) (names_addr + used), 0, names_size - used); kr = vm_map_copyin(ipc_kernel_map, names_addr, names_size, TRUE, ©); @@ -959,7 +961,7 @@ used = max_zones * sizeof *info; if (used != info_size) - bzero((char *) (info_addr + used), info_size - used); + memset((char *) (info_addr + used), 0, info_size - used); kr = vm_map_copyin(ipc_kernel_map, info_addr, info_size, TRUE, ©); Index: vm/vm_debug.c =================================================================== RCS file: /cvsroot/hurd/gnumach/vm/vm_debug.c,v retrieving revision 1.2.2.1 diff -u -r1.2.2.1 vm_debug.c --- vm/vm_debug.c 15 Oct 2006 14:59:05 -0000 1.2.2.1 +++ vm/vm_debug.c 5 Nov 2006 16:42:16 -0000 @@ -31,6 +31,8 @@ * Exported kernel calls. See mach_debug/mach_debug.defs. */ +#include + #if MACH_VM_DEBUG #include @@ -402,7 +404,7 @@ addr + rsize_used, size - rsize_used); if (size_used != rsize_used) - bzero((char *) (addr + size_used), + memset((char *) (addr + size_used), 0, rsize_used - size_used); kr = vm_map_copyin(ipc_kernel_map, addr, rsize_used, Index: vm/vm_kern.c =================================================================== RCS file: /cvsroot/hurd/gnumach/vm/vm_kern.c,v retrieving revision 1.1.1.1.4.1 diff -u -r1.1.1.1.4.1 vm_kern.c --- vm/vm_kern.c 31 Jan 2006 09:21:05 -0000 1.1.1.1.4.1 +++ vm/vm_kern.c 5 Nov 2006 16:42:16 -0000 @@ -34,6 +34,8 @@ * Kernel memory management. */ +#include + #include #include #include @@ -149,7 +151,7 @@ kmem_alloc_pages(object, 0, *kernel_p, *kernel_p + size, VM_PROT_READ | VM_PROT_WRITE); - bzero(*kernel_p, size); /*Zero fill*/ + memset(kernel_p, 0, size); /*Zero fill*/ /* Set up physical mappings for user pmap */ @@ -1035,7 +1037,7 @@ { if (vm_map_pmap(map) == kernel_pmap) { /* assume a correct copy */ - bcopy(fromaddr, toaddr, length); + memcpy(toaddr, fromaddr, length); return 0; } @@ -1061,7 +1063,7 @@ { if (vm_map_pmap(map) == kernel_pmap) { /* assume a correct copy */ - bcopy(fromaddr, toaddr, length); + memcpy(toaddr, fromaddr, length); return 0; } Index: vm/vm_object.c =================================================================== RCS file: /cvsroot/hurd/gnumach/vm/vm_object.c,v retrieving revision 1.2.4.3 diff -u -r1.2.4.3 vm_object.c --- vm/vm_object.c 15 Oct 2006 14:59:05 -0000 1.2.4.3 +++ vm/vm_object.c 5 Nov 2006 16:42:17 -0000 @@ -33,6 +33,8 @@ * Virtual memory object module. */ +#include + #include #include #include @@ -253,7 +255,7 @@ */ vm_object_template = (vm_object_t) zalloc(vm_object_zone); - bzero((char *) vm_object_template, sizeof *vm_object_template); + memset((char *) vm_object_template, 0, sizeof *vm_object_template); vm_object_template->ref_count = 1; vm_object_template->size = 0; Index: vm/vm_resident.c =================================================================== RCS file: /cvsroot/hurd/gnumach/vm/vm_resident.c,v retrieving revision 1.7.4.2 diff -u -r1.7.4.2 vm_resident.c --- vm/vm_resident.c 15 Oct 2006 14:59:05 -0000 1.7.4.2 +++ vm/vm_resident.c 5 Nov 2006 16:42:18 -0000 @@ -33,6 +33,8 @@ * Resident memory management module. */ +#include + #include #include #include @@ -959,7 +961,7 @@ } else alloc_size = 0; - bzero(bits, size); + memset(bits, 0, size); /* * A very large granularity call, its rare so that is ok