diff options
Diffstat (limited to 'usr.sbin/amd/amd/afs_ops.c')
| -rw-r--r-- | usr.sbin/amd/amd/afs_ops.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/usr.sbin/amd/amd/afs_ops.c b/usr.sbin/amd/amd/afs_ops.c index 953d3483efe..120e1af41f7 100644 --- a/usr.sbin/amd/amd/afs_ops.c +++ b/usr.sbin/amd/amd/afs_ops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: afs_ops.c,v 1.18 2014/10/26 03:08:21 guenther Exp $ */ +/* $OpenBSD: afs_ops.c,v 1.19 2014/10/26 03:28:41 guenther Exp $ */ /* * Copyright (c) 1990 Jan-Simon Pendry @@ -107,7 +107,7 @@ mount_toplvl(char *dir, char *opts) const char *type = MOUNT_NFS; - bzero((void *)&nfs_args, sizeof(nfs_args)); /* Paranoid */ + bzero(&nfs_args, sizeof(nfs_args)); /* Paranoid */ mnt.mnt_dir = dir; mnt.mnt_fsname = pid_fsname; @@ -138,7 +138,7 @@ mount_toplvl(char *dir, char *opts) * is not used since that will not work in HP-UX clusters and * this is no more expensive. */ - bzero((void *)&sin, sizeof(sin)); + bzero(&sin, sizeof(sin)); sin.sin_family = AF_INET; sin.sin_addr = myipaddr; if ((port = hasmntval(&mnt, "port"))) { @@ -227,7 +227,7 @@ afs_mkcacheref(mntfs *mf) cache = mf->mf_fo->opt_cache; else cache = "none"; - mf->mf_private = (void *)mapc_find(mf->mf_info, cache); + mf->mf_private = mapc_find(mf->mf_info, cache); mf->mf_prfree = mapc_free; } @@ -240,7 +240,7 @@ root_mount(am_node *mp) mntfs *mf = mp->am_mnt; mf->mf_mount = strealloc(mf->mf_mount, pid_fsname); - mf->mf_private = (void *)mapc_find(mf->mf_info, ""); + mf->mf_private = mapc_find(mf->mf_info, ""); mf->mf_prfree = mapc_free; return 0; @@ -410,7 +410,7 @@ union_mounted(mntfs *mf) * keep the wildcard and /defaults entries... */ mapc_free(mf->mf_private); - mf->mf_private = (void *)mapc_find(mf->mf_info, "inc"); + mf->mf_private = mapc_find(mf->mf_info, "inc"); /* mapc_add_kv(mf->mf_private, strdup("/defaults"), strdup("type:=link;opts:=nounmount;sublink:=${key}")); */ #endif @@ -586,7 +586,7 @@ afs_cont(int rc, int term, void *closure) /* * Wakeup anything waiting for this mount */ - wakeup((void *)mf); + wakeup(mf); /* * Check for termination signal or exit status... @@ -989,7 +989,7 @@ afs_bgmount(struct continuation *cp, int mpe) untimeout(cp->callout); cp->callout = 0; } - run_task(try_mount, (void *)mp, afs_cont, (void *)cp); + run_task(try_mount, mp, afs_cont, cp); mf->mf_flags |= MFF_MKMNT; /* XXX */ if (mf_retry) free_mntfs(mf_retry); return -1; @@ -997,7 +997,7 @@ afs_bgmount(struct continuation *cp, int mpe) #ifdef DEBUG dlog("foreground mount of \"%s\" ...", mf->mf_info); #endif /* DEBUG */ - this_error = try_mount((void *)mp); + this_error = try_mount(mp); if (this_error < 0) { if (!mf_retry) mf_retry = dup_mntfs(mf); @@ -1017,7 +1017,7 @@ afs_bgmount(struct continuation *cp, int mpe) /* * Wakeup anything waiting for this mount */ - wakeup((void *)mf); + wakeup(mf); } } @@ -1043,10 +1043,10 @@ afs_bgmount(struct continuation *cp, int mpe) #ifdef DEBUG dlog("Arranging to retry mount of %s", cp->mp->am_path); #endif /* DEBUG */ - sched_task(afs_retry, (void *)cp, (void *)mf); + sched_task(afs_retry, cp, mf); if (cp->callout) untimeout(cp->callout); - cp->callout = timeout(RETRY_INTERVAL, wakeup, (void *)mf); + cp->callout = timeout(RETRY_INTERVAL, wakeup, mf); cp->mp->am_ttl = clocktime() + RETRY_INTERVAL; @@ -1477,7 +1477,7 @@ in_progrss: cp->tried = FALSE; cp->start = clocktime(); cp->def_opts = strdup(auto_opts); - bzero((void *)&cp->fs_opts, sizeof(cp->fs_opts)); + bzero(&cp->fs_opts, sizeof(cp->fs_opts)); /* * Try and mount the file system |