From 0a4ada8d40fb687a659161ff7e0d1d0994264402 Mon Sep 17 00:00:00 2001 From: Justus Winter <4winter@informatik.uni-hamburg.de> Date: Mon, 1 Dec 2014 23:55:25 +0100 Subject: Replace `bzero' with `memset' For reference, this patch was created using the following semantic patch, and then manually applying the change in all functions containing nested functions, as those are not supported by Coccinelle. @@ expression A, B; @@ - bzero (A, B) + memset (A, 0, B) * auth/auth.c: Replace `bzero' with `memset'. * boot/boot.c: Likewise. * defpager/defpager.c: Likewise. * exec/exec.c: Likewise. Also, drop `safe_bzero' and just use `hurd_safe_memset' directly. * ext2fs/ext2fs.c: Likewise. * ext2fs/getblk.c: Likewise. * ext2fs/pager.c: Likewise. * fatfs/pager.c: Likewise. * ftpfs/dir.c: Likewise. * ftpfs/netfs.c: Likewise. * isofs/inode.c: Likewise. * isofs/pager.c: Likewise. * libdiskfs/file-getfh.c: Likewise. * libdiskfs/file-statfs.c: Likewise. * libfshelp/fetch-root.c: Likewise. * libfshelp/start-translator.c: Likewise. * libftpconn/create.c: Likewise. * libftpconn/open.c: Likewise. * libftpconn/unix.c: Likewise. * libpipe/pipe.c: Likewise. * libps/procstat.c: Likewise. * libps/spec.c: Likewise. * libshouldbeinlibc/cacheq.c: Likewise. * libshouldbeinlibc/idvec.c: Likewise. * libshouldbeinlibc/ugids.c: Likewise. * libstore/argp.c: Likewise. * libstore/enc.c: Likewise. * libstore/kids.c: Likewise. * libthreads/alpha/thread.c: Likewise. * libtreefs/fsys.c: Likewise. * libtrivfs/file-statfs.c: Likewise. * mach-defpager/default_pager.c: Likewise. * pfinet/glue-include/asm/uaccess.h: Likewise. * pfinet/io-ops.c: Likewise. * pfinet/options.c: Likewise. * pfinet/socket.c: Likewise. * pfinet/timer-emul.c: Likewise. * pflocal/io.c: Likewise. * startup/startup.c: Likewise. * storeio/storeio.c: Likewise. * sutils/fstab.c: Likewise. * usermux/usermux.c: Likewise. * utils/fakeauth.c: Likewise. * utils/frobauth.c: Likewise. * utils/login.c: Likewise. * utils/x.c: Likewise. --- auth/auth.c | 2 +- boot/boot.c | 4 ++-- defpager/defpager.c | 3 +-- exec/exec.c | 18 +++++++----------- ext2fs/ext2fs.c | 2 +- ext2fs/getblk.c | 2 +- ext2fs/pager.c | 4 ++-- fatfs/pager.c | 2 +- ftpfs/dir.c | 4 ++-- ftpfs/netfs.c | 2 +- isofs/inode.c | 2 +- isofs/pager.c | 2 +- libdiskfs/file-getfh.c | 2 +- libdiskfs/file-statfs.c | 2 +- libfshelp/fetch-root.c | 6 +++--- libfshelp/start-translator.c | 2 +- libftpconn/create.c | 2 +- libftpconn/open.c | 2 +- libftpconn/unix.c | 4 ++-- libpipe/pipe.c | 6 +++--- libps/procstat.c | 4 ++-- libps/spec.c | 2 +- libshouldbeinlibc/cacheq.c | 2 +- libshouldbeinlibc/idvec.c | 2 +- libshouldbeinlibc/ugids.c | 2 +- libstore/argp.c | 2 +- libstore/enc.c | 4 ++-- libstore/kids.c | 2 +- libthreads/alpha/thread.c | 2 +- libtreefs/fsys.c | 4 ++-- libtrivfs/file-statfs.c | 2 +- mach-defpager/default_pager.c | 8 ++++---- pfinet/glue-include/asm/uaccess.h | 2 +- pfinet/io-ops.c | 2 +- pfinet/options.c | 4 ++-- pfinet/socket.c | 2 +- pfinet/timer-emul.c | 2 +- pflocal/io.c | 4 ++-- startup/startup.c | 4 ++-- storeio/storeio.c | 4 ++-- sutils/fstab.c | 4 ++-- usermux/usermux.c | 5 +++-- utils/fakeauth.c | 2 +- utils/frobauth.c | 2 +- utils/login.c | 4 ++-- utils/x.c | 4 ++-- 46 files changed, 75 insertions(+), 79 deletions(-) diff --git a/auth/auth.c b/auth/auth.c index 7d35bd37..c36bcb20 100644 --- a/auth/auth.c +++ b/auth/auth.c @@ -59,7 +59,7 @@ create_authhandle (struct authhandle **new) error_t err = ports_create_port (authhandle_portclass, auth_bucket, sizeof **new, new); if (! err) - bzero (&(*new)->euids, (void *) &(*new)[1] - (void *) &(*new)->euids); + memset (&(*new)->euids, 0, (void *)&(*new)[1] - (void *)&(*new)->euids); return err; } diff --git a/boot/boot.c b/boot/boot.c index e2cb9075..4bdeb526 100644 --- a/boot/boot.c +++ b/boot/boot.c @@ -359,7 +359,7 @@ boot_script_exec_cmd (void *hook, *(char **) p = 0; p = (void *) p + sizeof (char *); memcpy (p, strings, stringlen); - bzero (args, (vm_offset_t) arg_pos & (vm_page_size - 1)); + memset (args, 0, (vm_offset_t)arg_pos & (vm_page_size - 1)); vm_write (task, trunc_page ((vm_offset_t) arg_pos), (vm_address_t) args, stack_end - trunc_page ((vm_offset_t) arg_pos)); munmap ((caddr_t) args, @@ -1579,7 +1579,7 @@ S_io_stat (mach_port_t object, if (object != pseudo_console) return EOPNOTSUPP; - bzero (st, sizeof (struct stat)); + memset (st, 0, sizeof(struct stat)); st->st_blksize = 1024; return 0; } diff --git a/defpager/defpager.c b/defpager/defpager.c index 3a824cf1..f97b489c 100644 --- a/defpager/defpager.c +++ b/defpager/defpager.c @@ -45,8 +45,7 @@ expand_map (struct user_pager_info *p, vm_offset_t addr) newsize = page + vm_page_size; newmap = realloc (pager->map, size / vm_page_size * sizeof (off_t)); - bzero (pager->map + pager->size / vm_page_size * sizeof (off_t), - (newsize - pager->size) / vm_page_size * sizeof (off_t)); + memset (pager->map + pager->size / vm_page_size * sizeof(off_t), 0, (newsize - pager->size) / vm_page_size * sizeof(off_t)); pager->size = newsize; pager->map = newmap; } diff --git a/exec/exec.c b/exec/exec.c index 0ecf2d3e..bbe02446 100644 --- a/exec/exec.c +++ b/exec/exec.c @@ -47,13 +47,6 @@ pthread_rwlock_t std_lock = PTHREAD_RWLOCK_INITIALIZER; #include -static error_t -safe_bzero (void *ptr, size_t size) -{ - return hurd_safe_memset (ptr, 0, size); -} - - /* Load or allocate a section. */ static void load_section (void *section, struct execdata *u) @@ -328,7 +321,9 @@ load_section (void *section, struct execdata *u) vm_deallocate (u->task, mapstart, memsz); return; } - u->error = safe_bzero ((void *) (ourpage + (addr - overlap_page)), + u->error = hurd_safe_memset ( + (void *) (ourpage + (addr - overlap_page)), + 0, size - (addr - overlap_page)); if (! u->error && !(vm_prot & VM_PROT_WRITE)) u->error = vm_protect (u->task, overlap_page, size, @@ -887,7 +882,7 @@ do_exec (file_t file, pthread_rwlock_unlock (&std_lock); goto out; } - bzero (&boot->pi + 1, (char *) &boot[1] - (char *) (&boot->pi + 1)); + memset (&boot->pi + 1, 0, (char *) &boot[1] - (char *) (&boot->pi + 1)); /* These flags say the information we pass through to the new program may need to be modified. */ @@ -960,7 +955,7 @@ do_exec (file_t file, /* Keep track of which ports in BOOT->portarray come from the original PORTARRAY, and which we replace. */ ports_replaced = alloca (boot->nports * sizeof *ports_replaced); - bzero (ports_replaced, boot->nports * sizeof *ports_replaced); + memset (ports_replaced, 0, boot->nports * sizeof *ports_replaced); if (portarray[INIT_PORT_BOOTSTRAP] == MACH_PORT_NULL && oldtask != MACH_PORT_NULL) @@ -1326,7 +1321,8 @@ do_exec (file_t file, /* Kill the pointers to the argument information so the cleanup of BOOT doesn't deallocate it. It will be deallocated my MiG when we return the error. */ - bzero (&boot->pi + 1, (char *) &boot[1] - (char *) (&boot->pi + 1)); + memset (&boot->pi + 1, 0, + (char *) &boot[1] - (char *) (&boot->pi + 1)); else /* Do this before we release the last reference. */ if (boot->nports > INIT_PORT_PROC) diff --git a/ext2fs/ext2fs.c b/ext2fs/ext2fs.c index 128b6edd..beb7cad9 100644 --- a/ext2fs/ext2fs.c +++ b/ext2fs/ext2fs.c @@ -106,7 +106,7 @@ parse_opt (int key, char *arg, struct argp_state *state) if (values == 0) return ENOMEM; state->hook = values; - bzero (values, sizeof *values); + memset (values, 0, sizeof *values); values->sb_block = SBLOCK_BLOCK; break; diff --git a/ext2fs/getblk.c b/ext2fs/getblk.c index bde66e1c..d7ddb6a1 100644 --- a/ext2fs/getblk.c +++ b/ext2fs/getblk.c @@ -105,7 +105,7 @@ ext2_alloc_block (struct node *node, block_t goal, int zero) if (result && zero) { char *bh = disk_cache_block_ref (result); - bzero (bh, block_size); + memset (bh, 0, block_size); record_indir_poke (node, bh); } diff --git a/ext2fs/pager.c b/ext2fs/pager.c index 298dae7a..ae515305 100644 --- a/ext2fs/pager.c +++ b/ext2fs/pager.c @@ -265,7 +265,7 @@ file_pager_read_page (struct node *node, vm_offset_t page, break; STAT_INC (file_pagein_alloced_bufs); } - bzero (*buf + offs, block_size); + memset (*buf + offs, 0, block_size); offs += block_size; } else @@ -446,7 +446,7 @@ disk_pager_read_page (vm_offset_t page, void **buf, int *writelock) if (read != length) return EIO; if (!err && length != vm_page_size) - bzero ((void *)(*buf + length), vm_page_size - length); + memset ((void *)(*buf + length), 0, vm_page_size - length); *writelock = 0; diff --git a/fatfs/pager.c b/fatfs/pager.c index 0c590841..10d1fc96 100644 --- a/fatfs/pager.c +++ b/fatfs/pager.c @@ -152,7 +152,7 @@ root_dir_pager_read_page (vm_offset_t page, void **buf, int *writelock) pthread_rwlock_unlock (&diskfs_root_node->dn->alloc_lock); if (overrun) - bzero ((void *) *buf + vm_page_size - overrun, overrun); + memset ((void *)*buf + vm_page_size - overrun, 0, overrun); return err; } diff --git a/ftpfs/dir.c b/ftpfs/dir.c index a9fea22f..be20b3db 100644 --- a/ftpfs/dir.c +++ b/ftpfs/dir.c @@ -64,7 +64,7 @@ rehash (struct ftpfs_dir *dir, size_t new_len) if (! new_htable) return ENOMEM; - bzero (new_htable, new_len * sizeof (struct ftpfs_dir_entry *)); + memset (new_htable, 0, new_len * sizeof(struct ftpfs_dir_entry *)); for (i = 0; i < old_len; i++) while (old_htable[i]) @@ -124,7 +124,7 @@ lookup (struct ftpfs_dir *dir, const char *name, int add) e->node = 0; e->dir = dir; e->stat_timestamp = 0; - bzero (&e->stat, sizeof e->stat); + memset (&e->stat, 0, sizeof e->stat); e->symlink_target = 0; e->noent = 0; e->valid = 0; diff --git a/ftpfs/netfs.c b/ftpfs/netfs.c index 5359acb9..cf5d9079 100644 --- a/ftpfs/netfs.c +++ b/ftpfs/netfs.c @@ -385,7 +385,7 @@ error_t netfs_attempt_statfs (struct iouser *cred, struct node *node, struct statfs *st) { - bzero (st, sizeof *st); + memset (st, 0, sizeof *st); st->f_type = FSTYPE_FTP; st->f_fsid = getpid (); return 0; diff --git a/isofs/inode.c b/isofs/inode.c index cdc05ae3..247d8ac7 100644 --- a/isofs/inode.c +++ b/isofs/inode.c @@ -599,7 +599,7 @@ diskfs_set_statfs (struct statfs *st) { /* There is no easy way to determine the number of files on an ISO 9660 filesystem. */ - bzero (st, sizeof *st); + memset (st, 0, sizeof *st); st->f_type = FSTYPE_ISO9660; st->f_bsize = logical_block_size; st->f_blocks = isonum_733 (sblock->vol_sp_size); diff --git a/isofs/pager.c b/isofs/pager.c index d72a5144..35de37e4 100644 --- a/isofs/pager.c +++ b/isofs/pager.c @@ -75,7 +75,7 @@ pager_read_page (struct user_pager_info *upi, return EIO; if (overrun) - bzero ((void *) *buf + vm_page_size - overrun, overrun); + memset ((void *)*buf + vm_page_size - overrun, 0, overrun); return 0; } diff --git a/libdiskfs/file-getfh.c b/libdiskfs/file-getfh.c index 035705b5..e4bc8921 100644 --- a/libdiskfs/file-getfh.c +++ b/libdiskfs/file-getfh.c @@ -50,7 +50,7 @@ diskfs_S_file_getfh (struct protid *cred, char **fh, size_t *fh_len) f = (union diskfs_fhandle *) *fh; - bzero (f, sizeof *f); + memset (f, 0, sizeof *f); f->data.cache_id = node->cache_id; f->data.gen = node->dn_stat.st_gen; diff --git a/libdiskfs/file-statfs.c b/libdiskfs/file-statfs.c index 9d97ce66..c9fd6f1b 100644 --- a/libdiskfs/file-statfs.c +++ b/libdiskfs/file-statfs.c @@ -31,7 +31,7 @@ diskfs_S_file_statfs (struct protid *file, /* Start will all zeros, so the fs can skip fields for which it has no information to contribute. */ - bzero (statbuf, sizeof *statbuf); + memset (statbuf, 0, sizeof *statbuf); if (diskfs_readonly) statbuf->f_flag |= ST_RDONLY; diff --git a/libfshelp/fetch-root.c b/libfshelp/fetch-root.c index 45c7dd09..712c11f4 100644 --- a/libfshelp/fetch-root.c +++ b/libfshelp/fetch-root.c @@ -121,9 +121,9 @@ fshelp_fetch_root (struct transbox *box, void *cookie, goto return_error; } - bzero (ports, INIT_PORT_MAX * sizeof (mach_port_t)); - bzero (fds, (STDERR_FILENO + 1) * sizeof (mach_port_t)); - bzero (ints, INIT_INT_MAX * sizeof (int)); + memset (ports, 0, INIT_PORT_MAX * sizeof (mach_port_t)); + memset (fds, 0, (STDERR_FILENO + 1) * sizeof (mach_port_t)); + memset (ints, 0, INIT_INT_MAX * sizeof (int)); ports[INIT_PORT_CWDIR] = dotdot; ports[INIT_PORT_CRDIR] = reauth (getcrdir ()); diff --git a/libfshelp/start-translator.c b/libfshelp/start-translator.c index ba5418ec..7f0ae70d 100644 --- a/libfshelp/start-translator.c +++ b/libfshelp/start-translator.c @@ -38,7 +38,7 @@ fshelp_start_translator (fshelp_open_fn_t underlying_open_fn, ports[i] = MACH_PORT_NULL; for (i = 0; i < STDERR_FILENO + 1; i++) fds[i] = MACH_PORT_NULL; - bzero (ints, INIT_INT_MAX * sizeof (int)); + memset (ints, 0, INIT_INT_MAX * sizeof(int)); ports[INIT_PORT_CWDIR] = getcwdir (); ports[INIT_PORT_CRDIR] = getcrdir (); diff --git a/libftpconn/create.c b/libftpconn/create.c index 20a64561..0ffdb49a 100644 --- a/libftpconn/create.c +++ b/libftpconn/create.c @@ -54,7 +54,7 @@ ftp_conn_create (const struct ftp_conn_params *params, new->actv_data_addr = 0; new->cwd = 0; new->type = 0; - bzero (&new->syshooks, sizeof new->syshooks); + memset (&new->syshooks, 0, sizeof new->syshooks); if (new->hooks && new->hooks->init) err = (*new->hooks->init) (new); diff --git a/libftpconn/open.c b/libftpconn/open.c index f52bf4d0..f1a1b854 100644 --- a/libftpconn/open.c +++ b/libftpconn/open.c @@ -189,7 +189,7 @@ ftp_conn_open (struct ftp_conn *conn) close (conn->control); conn->control = -1; } - bzero (&conn->syshooks, sizeof conn->syshooks); + memset (&conn->syshooks, 0, sizeof conn->syshooks); csock = socket (PF_INET, SOCK_STREAM, 0); if (csock < 0) diff --git a/libftpconn/unix.c b/libftpconn/unix.c index 28efefdd..882fee8f 100644 --- a/libftpconn/unix.c +++ b/libftpconn/unix.c @@ -305,7 +305,7 @@ drwxrwxrwt 7 34 archive 512 May 1 14:28 /tmp if (strncasecmp (p, "total ", 6) == 0) return EAGAIN; - bzero (stat, sizeof *stat); + memset (stat, 0, sizeof *stat); #ifdef FSTYPE_FTP stat->st_fstype = FSTYPE_FTP; @@ -471,7 +471,7 @@ drwxrwxrwt 7 34 archive 512 May 1 14:28 /tmp /* Date. Ick. */ /* Formats: MONTH DAY HH:MM and MONTH DAY YEAR */ - bzero (&tm, sizeof tm); + memset (&tm, 0, sizeof tm); SKIP_WS (); e = p + strcspn (p, " \t\n"); diff --git a/libpipe/pipe.c b/libpipe/pipe.c index b7ee8515..9580eb77 100644 --- a/libpipe/pipe.c +++ b/libpipe/pipe.c @@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include /* For bzero() */ +#include /* For memset() */ #include #include @@ -58,8 +58,8 @@ pipe_create (struct pipe_class *class, struct pipe **pipe) new->write_limit = 16*1024; new->write_atomic = 16*1024; - bzero (&new->read_time, sizeof (new->read_time)); - bzero (&new->write_time, sizeof (new->write_time)); + memset (&new->read_time, 0, sizeof(new->read_time)); + memset (&new->write_time, 0, sizeof(new->write_time)); pthread_cond_init (&new->pending_reads, NULL); pthread_cond_init (&new->pending_read_selects, NULL); diff --git a/libps/procstat.c b/libps/procstat.c index 0d4a565b..9f488cd6 100644 --- a/libps/procstat.c +++ b/libps/procstat.c @@ -361,7 +361,7 @@ summarize_thread_basic_info (struct procinfo *pi, ps_flags_t have) if (!tbi) return 0; - bzero (tbi, sizeof *tbi); + memset (tbi, 0, sizeof *tbi); for (i = 0; i < pi->nthreads; i++) if (! pi->threadinfos[i].died @@ -458,7 +458,7 @@ summarize_thread_sched_info (struct procinfo *pi) if (!tsi) return 0; - bzero (tsi, sizeof *tsi); + memset (tsi, 0, sizeof *tsi); for (i = 0; i < pi->nthreads; i++) if (! pi->threadinfos[i].died diff --git a/libps/spec.c b/libps/spec.c index d645b825..d8188d6b 100644 --- a/libps/spec.c +++ b/libps/spec.c @@ -1036,7 +1036,7 @@ specs_add_alias (struct ps_fmt_specs *specs, exp->nominal_fn = alias->nominal_fn ?: src->nominal_fn; /* Now add the list-end marker. */ - bzero (exp + 1, sizeof (*exp)); + memset (exp + 1, 0, sizeof(*exp)); return exp; } diff --git a/libshouldbeinlibc/cacheq.c b/libshouldbeinlibc/cacheq.c index c1be59c0..5912f84c 100644 --- a/libshouldbeinlibc/cacheq.c +++ b/libshouldbeinlibc/cacheq.c @@ -97,7 +97,7 @@ cacheq_set_length (struct cacheq *cq, int length) if (fh && th) bcopy (fh, th, esz); /* Copy the bits in a moved entry. */ else if (th) - bzero (th, esz); /* Zero the bits in a new entry. */ + memset (th, 0, esz); /* Zero the bits in a new entry. */ if (th) /* Fixup headers. */ diff --git a/libshouldbeinlibc/idvec.c b/libshouldbeinlibc/idvec.c index 7fdee104..c60fc9fb 100644 --- a/libshouldbeinlibc/idvec.c +++ b/libshouldbeinlibc/idvec.c @@ -115,7 +115,7 @@ idvec_insert (struct idvec *idvec, unsigned pos, uid_t id) if (pos < num) bcopy (ids + pos, ids + pos + 1, (num - pos) * sizeof (uid_t)); else if (pos > num) - bzero (ids + num, (pos - num) * sizeof (uid_t)); + memset (ids + num, 0, (pos - num) * sizeof(uid_t)); ids[pos] = id; idvec->num = new_num; } diff --git a/libshouldbeinlibc/ugids.c b/libshouldbeinlibc/ugids.c index db1ce3c8..07a11fe2 100644 --- a/libshouldbeinlibc/ugids.c +++ b/libshouldbeinlibc/ugids.c @@ -30,7 +30,7 @@ make_ugids () { struct ugids *u = malloc (sizeof (struct ugids)); if (u) - bzero (u, sizeof *u); + memset (u, 0, sizeof *u); return u; } diff --git a/libstore/argp.c b/libstore/argp.c index 6ed79964..73146a8d 100644 --- a/libstore/argp.c +++ b/libstore/argp.c @@ -350,7 +350,7 @@ parse_opt (int opt, char *arg, struct argp_state *state) parsed = state->hook = malloc (sizeof (struct store_parsed)); if (! parsed) return ENOMEM; - bzero (parsed, sizeof (struct store_parsed)); + memset (parsed, 0, sizeof(struct store_parsed)); parsed->classes = params->classes; parsed->default_type = find_class (params->default_type ?: DEFAULT_STORE_CLASS.name, diff --git a/libstore/enc.c b/libstore/enc.c index d5002a0e..5838c172 100644 --- a/libstore/enc.c +++ b/libstore/enc.c @@ -33,7 +33,7 @@ store_enc_init (struct store_enc *enc, off_t *offsets, mach_msg_type_number_t num_offsets, char *data, mach_msg_type_number_t data_len) { - bzero (enc, sizeof (*enc)); + memset (enc, 0, sizeof(*enc)); enc->ports = enc->init_ports = ports; enc->num_ports = num_ports; @@ -75,7 +75,7 @@ store_enc_dealloc (struct store_enc *enc) munmap (enc->data, enc->data_len); /* For good measure... */ - bzero (enc, sizeof (*enc)); + memset (enc, 0, sizeof(*enc)); } /* Copy out the parameters from ENC into the given variables suitably for diff --git a/libstore/kids.c b/libstore/kids.c index 901a7f85..5ad94543 100644 --- a/libstore/kids.c +++ b/libstore/kids.c @@ -206,7 +206,7 @@ store_open_children (const char *name, int flags, if (! *stores) return ENOMEM; - bzero (*stores, count * sizeof (struct store *)); + memset (*stores, 0, count * sizeof(struct store *)); /* Open each child store. */ for (p = name, k = 0; !err && p && p[1]; p = end, k++) diff --git a/libthreads/alpha/thread.c b/libthreads/alpha/thread.c index db2cb0c8..350fd5fc 100644 --- a/libthreads/alpha/thread.c +++ b/libthreads/alpha/thread.c @@ -82,7 +82,7 @@ cproc_setup( * Set up ALPHA call frame and registers. */ ts = &state; - bzero((char *) ts, sizeof(struct alpha_thread_state)); + memset ((char *)ts, 0, sizeof(struct alpha_thread_state)); top = (integer_t *) (child->stack_base + child->stack_size); diff --git a/libtreefs/fsys.c b/libtreefs/fsys.c index d6565bb9..fe1b9178 100644 --- a/libtreefs/fsys.c +++ b/libtreefs/fsys.c @@ -81,7 +81,7 @@ treefs_create_fsys (struct port_bucket *port_bucket, (*fsys)->root = NULL; (*fsys)->underlying_port = MACH_PORT_NULL; - bzero (&(*fsys)->underlying_stat, sizeof (struct stat)); + memset (&(*fsys)->underlying_stat, 0, sizeof(struct stat)); (*fsys)->flags = treefs_default_flags; (*fsys)->max_symlinks = treefs_default_max_symlinks; @@ -109,7 +109,7 @@ void ACKACKACK() goto barf; /* Remember stat info for the node we're mounted on. */ - bzero (&(*fsys)->underlying_stat, sizeof (struct stat)); + memset (&(*fsys)->underlying_stat, 0, sizeof (struct stat)); file_stat (realnode, &(*fsys)->underlying_stat); /* Note that it points to *FSYS, but *FSYS's root doesn't point to it... diff --git a/libtrivfs/file-statfs.c b/libtrivfs/file-statfs.c index 348126e8..267ac505 100644 --- a/libtrivfs/file-statfs.c +++ b/libtrivfs/file-statfs.c @@ -28,7 +28,7 @@ trivfs_S_file_statfs (struct trivfs_protid *cred, if (!trivfs_fsid) trivfs_fsid = getpid(); - bzero (stb, sizeof (struct statfs)); + memset (stb, 0, sizeof(struct statfs)); stb->f_type = trivfs_fstype; stb->f_fsid = trivfs_fsid; diff --git a/mach-defpager/default_pager.c b/mach-defpager/default_pager.c index 831ed968..9e4b0e76 100644 --- a/mach-defpager/default_pager.c +++ b/mach-defpager/default_pager.c @@ -192,7 +192,7 @@ new_partition (const char *name, struct file_direct *fdp, part->going_away= FALSE; part->file = fdp; - bzero((char *)part->bitmap, bmsize); + memset ((char *)part->bitmap, 0, bmsize); if (check_linux_signature < 0) { @@ -428,7 +428,7 @@ create_paging_partition(const char *name, new_list = (partition_t *) kalloc( n * sizeof(partition_t) ); if (new_list == 0) no_paging_space(TRUE); - bzero(new_list, n*sizeof(partition_t)); + memset (new_list, 0, n * sizeof(partition_t)); if (i) { old_list = all_partitions.partition_list; bcopy(old_list, new_list, i*sizeof(partition_t)); @@ -1640,7 +1640,7 @@ default_read(ds, addr, size, offset, out_addr, deallocate, external) * An external object is requesting unswapped data, * zero fill the page and return. */ - bzero((char *) addr, vm_page_size); + memset ((char *)addr, 0, vm_page_size); *out_addr = addr; return (PAGER_SUCCESS); } @@ -2118,7 +2118,7 @@ default_pager_t pager_port_alloc(size) ds = (default_pager_t) kalloc(sizeof *ds); if (ds == DEFAULT_PAGER_NULL) panic("%spager_port_alloc",my_name); - bzero((char *) ds, sizeof *ds); + memset ((char *)ds, 0, sizeof *ds); dstruct_lock_init(ds); diff --git a/pfinet/glue-include/asm/uaccess.h b/pfinet/glue-include/asm/uaccess.h index 6f6dc413..752c61c0 100644 --- a/pfinet/glue-include/asm/uaccess.h +++ b/pfinet/glue-include/asm/uaccess.h @@ -43,7 +43,7 @@ struct __large_struct { unsigned long buf[100]; }; #define copy_to_user(to,from,n) (memcpy ((to), (from), (n)), 0) #define copy_from_user(to,from,n) (memcpy ((to), (from), (n)), 0) -#define clear_user(mem, len) (bzero ((mem), (len)), 0) +#define clear_user(mem, len) (memset ((mem), 0, (len)), 0) #define copy_to_user_ret(to,from,n,retval) ({ if (copy_to_user(to,from,n)) return retval; }) diff --git a/pfinet/io-ops.c b/pfinet/io-ops.c index 96dbec85..cc666cd6 100644 --- a/pfinet/io-ops.c +++ b/pfinet/io-ops.c @@ -339,7 +339,7 @@ S_io_stat (struct sock_user *user, if (!user) return EOPNOTSUPP; - bzero (st, sizeof (struct stat)); + memset (st, 0, sizeof(struct stat)); st->st_fstype = FSTYPE_SOCKET; st->st_fsid = getpid (); diff --git a/pfinet/options.c b/pfinet/options.c index e9b81a9c..4b143563 100644 --- a/pfinet/options.c +++ b/pfinet/options.c @@ -418,8 +418,8 @@ parse_opt (int opt, char *arg, struct argp_state *state) req.nlh.nlmsg_seq = 0; req.nlh.nlmsg_len = NLMSG_LENGTH (sizeof req.rtm); - bzero (&req.rtm, sizeof req.rtm); - bzero (&rta, sizeof rta); + memset (&req.rtm, 0, sizeof req.rtm); + memset (&rta, 0, sizeof rta); req.rtm.rtm_scope = RT_SCOPE_UNIVERSE; req.rtm.rtm_type = RTN_UNICAST; req.rtm.rtm_protocol = RTPROT_STATIC; diff --git a/pfinet/socket.c b/pfinet/socket.c index 23a2dd91..06ce2c7e 100644 --- a/pfinet/socket.c +++ b/pfinet/socket.c @@ -50,7 +50,7 @@ sock_alloc (void) return 0; c = (void *) &sock[1]; pthread_cond_init (c, NULL); - bzero (sock, sizeof *sock); + memset (sock, 0, sizeof *sock); sock->state = SS_UNCONNECTED; sock->identity = MACH_PORT_NULL; sock->refcnt = 1; diff --git a/pfinet/timer-emul.c b/pfinet/timer-emul.c index f6760d7e..2053f80f 100644 --- a/pfinet/timer-emul.c +++ b/pfinet/timer-emul.c @@ -152,7 +152,7 @@ mod_timer (struct timer_list *timer, unsigned long expires) void init_timer (struct timer_list *timer) { - bzero (timer, sizeof (struct timer_list)); + memset (timer, 0, sizeof(struct timer_list)); } void diff --git a/pflocal/io.c b/pflocal/io.c index 00e859a4..ee6fb840 100644 --- a/pflocal/io.c +++ b/pflocal/io.c @@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include /* For bzero() */ +#include /* For memset() */ #include #include #include @@ -319,7 +319,7 @@ S_io_stat (struct sock_user *user, struct stat *st) sock = user->sock; - bzero (st, sizeof (struct stat)); + memset (st, 0, sizeof (struct stat)); st->st_fstype = FSTYPE_SOCKET; st->st_mode = sock->mode; diff --git a/startup/startup.c b/startup/startup.c index e1770752..601c8946 100644 --- a/startup/startup.c +++ b/startup/startup.c @@ -742,8 +742,8 @@ init_stdarrays () std_port_array = alloca (sizeof (mach_port_t) * INIT_PORT_MAX); std_int_array = alloca (sizeof (int) * INIT_INT_MAX); - bzero (std_port_array, sizeof (mach_port_t) * INIT_PORT_MAX); - bzero (std_int_array, sizeof (int) * INIT_INT_MAX); + memset (std_port_array, 0, sizeof(mach_port_t) * INIT_PORT_MAX); + memset (std_int_array, 0, sizeof(int) * INIT_INT_MAX); __USEPORT (AUTH, auth_makeauth (port, 0, MACH_MSG_TYPE_COPY_SEND, 0, 0, 0, 0, 0, 0, 0, 0, 0, &nullauth)); diff --git a/storeio/storeio.c b/storeio/storeio.c index eb383495..fcf2f30f 100644 --- a/storeio/storeio.c +++ b/storeio/storeio.c @@ -99,7 +99,7 @@ parse_opt (int key, char *arg, struct argp_state *state) case ARGP_KEY_INIT: /* Now store_argp's parser will get to initialize its state. The default_type member is our input parameter to it. */ - bzero (¶ms->store_params, sizeof params->store_params); + memset (¶ms->store_params, 0, sizeof params->store_params); params->store_params.default_type = "device"; params->store_params.store_optional = 1; state->child_inputs[0] = ¶ms->store_params; @@ -128,7 +128,7 @@ main (int argc, char *argv[]) struct dev device; struct storeio_argp_params params; - bzero (&device, sizeof device); + memset (&device, 0, sizeof device); pthread_mutex_init (&device.lock, NULL); params.dev = &device; diff --git a/sutils/fstab.c b/sutils/fstab.c index e13f15b0..24a1a0df 100644 --- a/sutils/fstab.c +++ b/sutils/fstab.c @@ -600,7 +600,7 @@ fstab_add_mntent (struct fstab *const fstab, const struct mntent *mntent, fs = malloc (sizeof (struct fs)); if (fs) { - bzero (fs, sizeof (struct fs)); + memset (fs, 0, sizeof(struct fs)); fs->mounted = fs->readonly = -1; fs->fsys = MACH_PORT_NULL; new = 1; @@ -783,7 +783,7 @@ parse_opt (int key, char *arg, struct argp_state *state) /* Initialize our parsing state. */ if (! params) return EINVAL; /* Need at least a way to return a result. */ - bzero (params, sizeof *params); + memset (params, 0, sizeof *params); break; case 'A': diff --git a/usermux/usermux.c b/usermux/usermux.c index fad923c9..e89177bd 100644 --- a/usermux/usermux.c +++ b/usermux/usermux.c @@ -84,10 +84,11 @@ main (int argc, char **argv) case OPT_USER_PAT: mux.user_pat = arg; break; case OPT_HOME_PAT: mux.home_pat = arg; break; case OPT_UID_PAT: mux.uid_pat = arg; break; - case 'C': bzero (&mux, sizeof mux); break; + case 'C': memset (&mux, 0, sizeof mux); break; case ARGP_KEY_NO_ARGS: - bzero (&mux, sizeof mux); /* Default doesn't use them; be careful. */ + memset (&mux, 0, sizeof mux); /* Default doesn't use them; + be careful. */ return argz_create_sep (_HURD_SYMLINK, 0, &mux.trans_template, &mux.trans_template_len); case ARGP_KEY_ARGS: diff --git a/utils/fakeauth.c b/utils/fakeauth.c index 590a421a..ba6a3eef 100644 --- a/utils/fakeauth.c +++ b/utils/fakeauth.c @@ -50,7 +50,7 @@ create_authhandle (struct authhandle **new) error_t err = ports_create_port (authhandle_portclass, auth_bucket, sizeof **new, new); if (! err) - bzero (&(*new)->euids, (void *) &(*new)[1] - (void *) &(*new)->euids); + memset (&(*new)->euids, 0, (void *)&(*new)[1] - (void *)&(*new)->euids); return err; } diff --git a/utils/frobauth.c b/utils/frobauth.c index 44690d82..5de77209 100644 --- a/utils/frobauth.c +++ b/utils/frobauth.c @@ -123,7 +123,7 @@ common_parse_opt (int key, char *arg, struct argp_state *state) break; case ARGP_KEY_INIT: - bzero (fs, sizeof *fs); + memset (fs, 0, sizeof *fs); fs->frobauth = frobauth; fs->pids_argp_params.pids = &frobauth->pids; fs->pids_argp_params.num_pids = &frobauth->num_pids; diff --git a/utils/login.c b/utils/login.c index a3e05636..9ee296aa 100644 --- a/utils/login.c +++ b/utils/login.c @@ -158,7 +158,7 @@ add_utmp_entry (char *args, unsigned args_len, int inherit_host) char const *host = 0; long addr = 0; - bzero (&utmp, sizeof (utmp)); + memset (&utmp, 0, sizeof(utmp)); gettimeofday (&utmp.ut_tv, 0); strncpy (utmp.ut_name, envz_get (args, args_len, "USER") ?: "", @@ -683,7 +683,7 @@ main(int argc, char *argv[]) proc_setowner (proc_server, 0, 1); /* Clear the owner. */ /* Now start constructing the exec arguments. */ - bzero (ints, sizeof (*ints) * INIT_INT_MAX); + memset (ints, 0, sizeof (*ints) * INIT_INT_MAX); arg = envz_get (args, args_len, "UMASK"); ints[INIT_UMASK] = arg && *arg ? strtoul (arg, 0, 8) : umask (0); diff --git a/utils/x.c b/utils/x.c index 7bbc8ac5..518f3847 100644 --- a/utils/x.c +++ b/utils/x.c @@ -228,8 +228,8 @@ main(int argc, char *argv[]) } struct argp argp = {options, parse_opt, args_doc, doc}; - bzero (add, sizeof add); - bzero (remove, sizeof remove); + memset (add, 0, sizeof add); + memset (remove, 0, sizeof remove); err = -- cgit v1.2.3