Make this compile again.

PR:		5948
Submitted by:	Brian Feldman
This commit is contained in:
Steve Price 1998-03-08 19:03:05 +00:00
parent be01eafd5f
commit 227776616a
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=34322
2 changed files with 6 additions and 6 deletions

View File

@ -42,7 +42,7 @@ static const char copyright[] =
static char sccsid[] = "@(#)mount_ufs.c 8.4 (Berkeley) 4/26/95"; static char sccsid[] = "@(#)mount_ufs.c 8.4 (Berkeley) 4/26/95";
#else #else
static const char rcsid[] = static const char rcsid[] =
"$Id: mount_ufs.c,v 1.10 1997/08/25 21:14:22 bde Exp $"; "$Id: mount_ufs.c,v 1.11 1998/03/08 14:50:04 msmith Exp $";
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -84,7 +84,7 @@ mount_ufs(argc, argv)
struct vfsconf vfc; struct vfsconf vfc;
int error = 0; int error = 0;
#ifdef ROOTSLICE_HUNT #ifdef ROOTSLICE_HUNT
int slice, part, result; int slice, part, result, unit;
char devbuf[MAXPATHLEN], devpfx[MAXPATHLEN]; char devbuf[MAXPATHLEN], devpfx[MAXPATHLEN];
#endif #endif
@ -154,7 +154,7 @@ mount_ufs(argc, argv)
fs_name, devbuf); fs_name, devbuf);
/* Try the mount as originally requested */ /* Try the mount as originally requested */
if ((result < 0) && if ((result < 0) &&
(mount(vfc.vfc_name, fs_name, mntflags, &args < 0)) { (mount(vfc.vfc_name, fs_name, mntflags, &args) < 0)) {
#else #else
if (mount(vfc.vfc_name, fs_name, mntflags, &args) < 0) { if (mount(vfc.vfc_name, fs_name, mntflags, &args) < 0) {
#endif #endif

View File

@ -42,7 +42,7 @@ static const char copyright[] =
static char sccsid[] = "@(#)mount_ufs.c 8.4 (Berkeley) 4/26/95"; static char sccsid[] = "@(#)mount_ufs.c 8.4 (Berkeley) 4/26/95";
#else #else
static const char rcsid[] = static const char rcsid[] =
"$Id: mount_ufs.c,v 1.10 1997/08/25 21:14:22 bde Exp $"; "$Id: mount_ufs.c,v 1.11 1998/03/08 14:50:04 msmith Exp $";
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -84,7 +84,7 @@ mount_ufs(argc, argv)
struct vfsconf vfc; struct vfsconf vfc;
int error = 0; int error = 0;
#ifdef ROOTSLICE_HUNT #ifdef ROOTSLICE_HUNT
int slice, part, result; int slice, part, result, unit;
char devbuf[MAXPATHLEN], devpfx[MAXPATHLEN]; char devbuf[MAXPATHLEN], devpfx[MAXPATHLEN];
#endif #endif
@ -154,7 +154,7 @@ mount_ufs(argc, argv)
fs_name, devbuf); fs_name, devbuf);
/* Try the mount as originally requested */ /* Try the mount as originally requested */
if ((result < 0) && if ((result < 0) &&
(mount(vfc.vfc_name, fs_name, mntflags, &args < 0)) { (mount(vfc.vfc_name, fs_name, mntflags, &args) < 0)) {
#else #else
if (mount(vfc.vfc_name, fs_name, mntflags, &args) < 0) { if (mount(vfc.vfc_name, fs_name, mntflags, &args) < 0) {
#endif #endif