Module Name: src
Committed By: riastradh
Date: Fri Jun 4 22:41:36 UTC 2021
Modified Files:
src/sbin/mount_chfs: mount_chfs.c mount_chfs.h
Log Message:
mount_chfs(8): Remove some vestiges of chewiefs name.
Add RCS id while here and nix some needless whitespace.
No functional change intended.
Patch from Andrius V.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sbin/mount_chfs/mount_chfs.c
cvs rdiff -u -r1.1 -r1.2 src/sbin/mount_chfs/mount_chfs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/mount_chfs/mount_chfs.c
diff -u src/sbin/mount_chfs/mount_chfs.c:1.2 src/sbin/mount_chfs/mount_chfs.c:1.3
--- src/sbin/mount_chfs/mount_chfs.c:1.2 Fri Sep 13 21:03:29 2013
+++ src/sbin/mount_chfs/mount_chfs.c Fri Jun 4 22:41:36 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mount_chfs.c,v 1.2 2013/09/13 21:03:29 joerg Exp $ */
+/* $NetBSD: mount_chfs.c,v 1.3 2021/06/04 22:41:36 riastradh Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -116,12 +116,11 @@ mount_chfs(int argc, char *argv[])
struct ufs_args args;
char canon_dev[MAXPATHLEN], fs_name[MAXPATHLEN];
int mntflags;
-
mount_chfs_parseargs(argc, argv, &args, &mntflags,
canon_dev, fs_name);
- if (mount(MOUNT_CHEWIEFS, fs_name, mntflags, &args, sizeof args) == -1) {
+ if (mount(MOUNT_CHFS, fs_name, mntflags, &args, sizeof args) == -1) {
err(EXIT_FAILURE, "chfs on %s", fs_name);
}
Index: src/sbin/mount_chfs/mount_chfs.h
diff -u src/sbin/mount_chfs/mount_chfs.h:1.1 src/sbin/mount_chfs/mount_chfs.h:1.2
--- src/sbin/mount_chfs/mount_chfs.h:1.1 Thu Nov 24 15:54:55 2011
+++ src/sbin/mount_chfs/mount_chfs.h Fri Jun 4 22:41:36 2021
@@ -1,3 +1,5 @@
+/* $NetBSD: mount_chfs.h,v 1.2 2021/06/04 22:41:36 riastradh Exp $ */
+
/*
* Copyright (c) 2008 The NetBSD Foundation. All Rights Reserved.
*
@@ -23,18 +25,17 @@
* SUCH DAMAGE.
*/
-#ifndef _SBIN_MOUNT_CHEWIEFS_MOUNT_CHEWIEFS_H_
-#define _SBIN_MOUNT_CHEWIEFS_MOUNT_CHEWIEFS_H_
+#ifndef _SBIN_MOUNT_CHFS_MOUNT_CHFS_H_
+#define _SBIN_MOUNT_CHFS_MOUNT_CHFS_H_
#include <ufs/ufs/ufsmount.h>
-#ifndef MOUNT_CHEWIEFS
-#define MOUNT_CHEWIEFS "chfs"
+#ifndef MOUNT_CHFS
+#define MOUNT_CHFS "chfs"
#endif
-
int mount_chfs(int, char **);
void mount_chfs_parseargs(int, char **, struct ufs_args *, int *,
char *, char *);
-#endif /* _SBIN_MOUNT_CHEWIEFS_MOUNT_CHEWIEFS_H_ */
+#endif /* _SBIN_MOUNT_CHFS_MOUNT_CHFS_H_ */
