From 384d80b3b93a5b31e22418f71aa091bf23a24595 Mon Sep 17 00:00:00 2001
From: Dima Dorfman
Date: Sun, 24 Jun 2001 23:31:07 +0000
Subject: [PATCH] Nuke unused variables.
---
sbin/bsdlabel/bsdlabel.c | 3 ---
sbin/disklabel/disklabel.c | 3 ---
sbin/mount_ifs/mount.c | 7 -------
sbin/mount_ntfs/mount_ntfs.c | 2 +-
4 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c
index 8f7ab5dd2853..cf3638f9df8c 100644
--- a/sbin/bsdlabel/bsdlabel.c
+++ b/sbin/bsdlabel/bsdlabel.c
@@ -959,7 +959,6 @@ getasciilabel(f, lp)
{
register char **cpp, *cp;
register struct partition *pp;
- int i;
unsigned int part;
char *tp, *s, line[BUFSIZ];
int v, lineno = 0, errors = 0;
@@ -1392,7 +1391,6 @@ checklabel(lp)
hog_part = i;
}
} else {
- char *type;
off_t size;
size = pp->p_size;
@@ -1452,7 +1450,6 @@ checklabel(lp)
for (i = 0; i < lp->d_npartitions; i++) {
pp = &lp->d_partitions[i];
if (part_set[i] && part_size_type[i] == '%') {
- unsigned long old_size = pp->p_size;
/* careful of overflows! and integer roundoff */
pp->p_size = ((double)pp->p_size/100) * free_space;
total_size += pp->p_size;
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c
index 8f7ab5dd2853..cf3638f9df8c 100644
--- a/sbin/disklabel/disklabel.c
+++ b/sbin/disklabel/disklabel.c
@@ -959,7 +959,6 @@ getasciilabel(f, lp)
{
register char **cpp, *cp;
register struct partition *pp;
- int i;
unsigned int part;
char *tp, *s, line[BUFSIZ];
int v, lineno = 0, errors = 0;
@@ -1392,7 +1391,6 @@ checklabel(lp)
hog_part = i;
}
} else {
- char *type;
off_t size;
size = pp->p_size;
@@ -1452,7 +1450,6 @@ checklabel(lp)
for (i = 0; i < lp->d_npartitions; i++) {
pp = &lp->d_partitions[i];
if (part_set[i] && part_size_type[i] == '%') {
- unsigned long old_size = pp->p_size;
/* careful of overflows! and integer roundoff */
pp->p_size = ((double)pp->p_size/100) * free_space;
total_size += pp->p_size;
diff --git a/sbin/mount_ifs/mount.c b/sbin/mount_ifs/mount.c
index 521be4a79a1c..40a36f5c1293 100644
--- a/sbin/mount_ifs/mount.c
+++ b/sbin/mount_ifs/mount.c
@@ -126,13 +126,6 @@ main(argc, argv)
int argc;
char * const argv[];
{
- const char *mntfromname, **vfslist, *vfstype;
- struct fstab *fs;
- struct statfs *mntbuf;
- FILE *mountdfp;
- pid_t pid;
- int all, ch, i, init_flags, mntsize, rval, have_fstab;
- char *options;
mount_ifs(argc, argv);
/* NOTREACHED */
diff --git a/sbin/mount_ntfs/mount_ntfs.c b/sbin/mount_ntfs/mount_ntfs.c
index 9dbd5fb7d24e..b01e4227a944 100644
--- a/sbin/mount_ntfs/mount_ntfs.c
+++ b/sbin/mount_ntfs/mount_ntfs.c
@@ -68,7 +68,7 @@ main(argc, argv)
struct ntfs_args args;
struct stat sb;
int c, mntflags, set_gid, set_uid, set_mask, error;
- char *dev, *dir, ndir[MAXPATHLEN+1], mntpath[MAXPATHLEN];
+ char *dev, *dir, mntpath[MAXPATHLEN];
#if __FreeBSD_version >= 300000
struct vfsconf vfc;
#else