summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFederico G. Schwindt <fgsch@cvs.openbsd.org>2000-06-20 06:45:17 +0000
committerFederico G. Schwindt <fgsch@cvs.openbsd.org>2000-06-20 06:45:17 +0000
commit6ff9f355ba46a2c6f0b59a527d33ffbcddcb7e8c (patch)
treee7c68cac5996bda04359d1d3c3c951771101f004
parent680a5c0bfe536beafe9ddbc02a1d47741d3cb17a (diff)
kill show_usage, it's only a printf. i'll replace this by err and friends
-rw-r--r--usr.bin/tcfs/tcfsaddgroup.c4
-rw-r--r--usr.bin/tcfs/tcfsadduser.c4
-rw-r--r--usr.bin/tcfs/tcfserrors.c7
-rw-r--r--usr.bin/tcfs/tcfsgenkey.c4
-rw-r--r--usr.bin/tcfs/tcfsrmgroup.c4
-rw-r--r--usr.bin/tcfs/tcfsrmuser.c4
6 files changed, 11 insertions, 16 deletions
diff --git a/usr.bin/tcfs/tcfsaddgroup.c b/usr.bin/tcfs/tcfsaddgroup.c
index 1e41d70b8ce..ddbe08e6fdb 100644
--- a/usr.bin/tcfs/tcfsaddgroup.c
+++ b/usr.bin/tcfs/tcfsaddgroup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcfsaddgroup.c,v 1.9 2000/06/19 23:06:25 aaron Exp $ */
+/* $OpenBSD: tcfsaddgroup.c,v 1.10 2000/06/20 06:45:16 fgsch Exp $ */
/*
* Transparent Cryptographic File System (TCFS) for NetBSD
@@ -204,7 +204,7 @@ addgroup_main(int argn, char *argv[])
have_threshold = TRUE;
break;
case 'h':
- show_usage(addgroup_usage, argv[0]);
+ printf(addgroup_usage, argv[0]);
exit(OK);
case 'v':
be_verbose = TRUE;
diff --git a/usr.bin/tcfs/tcfsadduser.c b/usr.bin/tcfs/tcfsadduser.c
index fa2c6b1be15..0c472cb78a7 100644
--- a/usr.bin/tcfs/tcfsadduser.c
+++ b/usr.bin/tcfs/tcfsadduser.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcfsadduser.c,v 1.5 2000/06/19 23:06:25 aaron Exp $ */
+/* $OpenBSD: tcfsadduser.c,v 1.6 2000/06/20 06:45:16 fgsch Exp $ */
/*
* Transparent Cryptographic File System (TCFS) for NetBSD
@@ -48,7 +48,7 @@ adduser_main(int argn, char *argv[])
have_user = 1;
break;
case 'h':
- show_usage(adduser_usage, argv[0]);
+ printf(adduser_usage, argv[0]);
exit(OK);
break;
case 'v':
diff --git a/usr.bin/tcfs/tcfserrors.c b/usr.bin/tcfs/tcfserrors.c
index 50e1cf15ae6..894dc85dfd9 100644
--- a/usr.bin/tcfs/tcfserrors.c
+++ b/usr.bin/tcfs/tcfserrors.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcfserrors.c,v 1.5 2000/06/19 22:42:28 aaron Exp $ */
+/* $OpenBSD: tcfserrors.c,v 1.6 2000/06/20 06:45:16 fgsch Exp $ */
/*
* Transparent Cryptographic File System (TCFS) for NetBSD
@@ -64,8 +64,3 @@ void tcfs_error(int error_type, char *custom_message)
exit(1);
}
}
-
-void show_usage(char *fmt, char *arg)
-{
- printf(fmt, arg);
-}
diff --git a/usr.bin/tcfs/tcfsgenkey.c b/usr.bin/tcfs/tcfsgenkey.c
index 072081e338b..c5b1aa1b7c7 100644
--- a/usr.bin/tcfs/tcfsgenkey.c
+++ b/usr.bin/tcfs/tcfsgenkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcfsgenkey.c,v 1.7 2000/06/19 23:06:25 aaron Exp $ */
+/* $OpenBSD: tcfsgenkey.c,v 1.8 2000/06/20 06:45:16 fgsch Exp $ */
/*
* Transparent Cryptographic File System (TCFS) for NetBSD
@@ -40,7 +40,7 @@ genkey_main(int argn, char *argv[])
while ((val = getopt(argn, argv, "h")) != EOF)
switch (val) {
case 'h':
- show_usage(genkey_usage, argv[0]);
+ printf(genkey_usage, argv[0]);
exit(OK);
break; /* Useless code */
default:
diff --git a/usr.bin/tcfs/tcfsrmgroup.c b/usr.bin/tcfs/tcfsrmgroup.c
index d5f869ad0e3..03ad2b0c213 100644
--- a/usr.bin/tcfs/tcfsrmgroup.c
+++ b/usr.bin/tcfs/tcfsrmgroup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcfsrmgroup.c,v 1.7 2000/06/19 23:06:25 aaron Exp $ */
+/* $OpenBSD: tcfsrmgroup.c,v 1.8 2000/06/20 06:45:16 fgsch Exp $ */
/*
* Transparent Cryptographic File System (TCFS) for NetBSD
@@ -53,7 +53,7 @@ rmgroup_main(int argn, char *argv[])
have_gid = TRUE;
break;
case 'h':
- show_usage(rmgroup_usage, argv[0]);
+ printf(rmgroup_usage, argv[0]);
exit(OK);
case 'v':
be_verbose = TRUE;
diff --git a/usr.bin/tcfs/tcfsrmuser.c b/usr.bin/tcfs/tcfsrmuser.c
index 407788996d7..ac7bc1a6e27 100644
--- a/usr.bin/tcfs/tcfsrmuser.c
+++ b/usr.bin/tcfs/tcfsrmuser.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcfsrmuser.c,v 1.6 2000/06/19 23:06:25 aaron Exp $ */
+/* $OpenBSD: tcfsrmuser.c,v 1.7 2000/06/20 06:45:16 fgsch Exp $ */
/*
* Transparent Cryptographic File System (TCFS) for NetBSD
@@ -53,7 +53,7 @@ rmuser_main(int argn, char *argv[])
have_user = TRUE;
break;
case 'h':
- show_usage(rmuser_usage, argv[0]);
+ printf(rmuser_usage, argv[0]);
exit(OK);
break;
case 'v':