summaryrefslogtreecommitdiff
path: root/sbin/mount_cd9660/mount_cd9660.c
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2002-04-23 18:54:13 +0000
committerMarc Espie <espie@cvs.openbsd.org>2002-04-23 18:54:13 +0000
commite9cca0aff478d6a7f8aa989f1f3b5c7796ecbe3b (patch)
tree5584e842283ad77a56a1c6a443c4ac6d0b4aeca4 /sbin/mount_cd9660/mount_cd9660.c
parentd70cb2c050204739bb31da06800d79bad94f2730 (diff)
In mount.h, rename field export -> export_info, to avoid collision with C++.
Synch files that use that field. (This argument is an internal interface specific to OpenBSD, so it won't cause compatibility problems.) (No bump, not an ABI change). ok art, millert...
Diffstat (limited to 'sbin/mount_cd9660/mount_cd9660.c')
-rw-r--r--sbin/mount_cd9660/mount_cd9660.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sbin/mount_cd9660/mount_cd9660.c b/sbin/mount_cd9660/mount_cd9660.c
index 4a35f1f5b74..aaabcc9ad0b 100644
--- a/sbin/mount_cd9660/mount_cd9660.c
+++ b/sbin/mount_cd9660/mount_cd9660.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mount_cd9660.c,v 1.12 2002/02/16 21:27:36 millert Exp $ */
+/* $OpenBSD: mount_cd9660.c,v 1.13 2002/04/23 18:54:12 espie Exp $ */
/* $NetBSD: mount_cd9660.c,v 1.3 1996/04/13 01:31:08 jtc Exp $ */
/*
@@ -49,7 +49,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)mount_cd9660.c 8.4 (Berkeley) 3/27/94";
#else
-static char rcsid[] = "$OpenBSD: mount_cd9660.c,v 1.12 2002/02/16 21:27:36 millert Exp $";
+static char rcsid[] = "$OpenBSD: mount_cd9660.c,v 1.13 2002/04/23 18:54:12 espie Exp $";
#endif
#endif /* not lint */
@@ -116,15 +116,15 @@ main(argc, argv)
#define DEFAULT_ROOTUID -2
args.fspec = dev;
- args.export.ex_root = DEFAULT_ROOTUID;
+ args.export_info.ex_root = DEFAULT_ROOTUID;
#if 1
mntflags |= MNT_RDONLY;
#endif
if (mntflags & MNT_RDONLY)
- args.export.ex_flags = MNT_EXRDONLY;
+ args.export_info.ex_flags = MNT_EXRDONLY;
else
- args.export.ex_flags = 0;
+ args.export_info.ex_flags = 0;
args.flags = opts;
if (mount(MOUNT_CD9660, dir, mntflags, &args) < 0) {