diff options
| author | obrien <obrien@FreeBSD.org> | 1999-09-15 05:45:17 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 1999-09-15 05:45:17 +0000 |
| commit | 5c1a3647e5e952726219b96156a3eebfa5789118 (patch) | |
| tree | a1a7d61cd30dc7bc80b9778e62052c5eee5e3d67 /contrib/amd/fixmount | |
| parent | e2c605abd09c68a264a51f01f9362d297976ea63 (diff) | |
| download | FreeBSD-src-5c1a3647e5e952726219b96156a3eebfa5789118.zip FreeBSD-src-5c1a3647e5e952726219b96156a3eebfa5789118.tar.gz | |
Fix conflicts.
Diffstat (limited to 'contrib/amd/fixmount')
| -rw-r--r-- | contrib/amd/fixmount/fixmount.8 | 5 | ||||
| -rw-r--r-- | contrib/amd/fixmount/fixmount.c | 14 |
2 files changed, 6 insertions, 13 deletions
diff --git a/contrib/amd/fixmount/fixmount.8 b/contrib/amd/fixmount/fixmount.8 index 008f0b4..14915af 100644 --- a/contrib/amd/fixmount/fixmount.8 +++ b/contrib/amd/fixmount/fixmount.8 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997-1998 Erez Zadok +.\" Copyright (c) 1997-1999 Erez Zadok .\" Copyright (c) 1990 Jan-Simon Pendry .\" Copyright (c) 1990 Imperial College of Science, Technology & Medicine .\" Copyright (c) 1990 The Regents of the University of California. @@ -38,7 +38,8 @@ .\" .\" %W% (Berkeley) %G% .\" -.\" $Id: fixmount.8,v 1.3 1998/09/12 04:04:58 obrien Exp $ +.\" $Id: fixmount.8,v 1.2 1999/01/10 21:54:26 ezk Exp $ +.\" $FreeBSD$ .\" .Dd February 26, 1993 .Dt FIXMOUNT 8 diff --git a/contrib/amd/fixmount/fixmount.c b/contrib/amd/fixmount/fixmount.c index 6c5826a..628e645 100644 --- a/contrib/amd/fixmount/fixmount.c +++ b/contrib/amd/fixmount/fixmount.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-1998 Erez Zadok + * Copyright (c) 1997-1999 Erez Zadok * Copyright (c) 1990 Jan-Simon Pendry * Copyright (c) 1990 Imperial College of Science, Technology & Medicine * Copyright (c) 1990 The Regents of the University of California. @@ -38,7 +38,8 @@ * * %W% (Berkeley) %G% * - * $Id: fixmount.c,v 1.3 1998/11/14 03:13:31 obrien Exp $ + * $Id: fixmount.c,v 1.4 1999/02/04 07:24:42 ezk Exp $ + * $FreeBSD$ * */ @@ -86,15 +87,6 @@ void fix_rmtab(CLIENT *, char *, mountlist, int, int); void print_dump(mountlist); void usage(void); -/* dummy variables */ -#if 0 -char *progname; -char hostname[MAXHOSTNAMELEN]; -pid_t mypid; -serv_state amd_state; -int foreground, orig_umask; -int debug_flags; -#endif void usage(void) |
