From 67991cf824f8df27e74c92d754fb507681c69ce6 Mon Sep 17 00:00:00 2001
From: Eric Andersen
Date: Wed, 14 Feb 2001 21:23:06 +0000
Subject: This patch, put together by Manuel Novoa III, is a merge of work done
 by Evin Robertson (bug#1105) and work from Manuel to make usage messages
 occupy less space and simplify how usage messages are displayed.

---
 modutils/insmod.c | 8 ++++----
 modutils/rmmod.c  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'modutils')

diff --git a/modutils/insmod.c b/modutils/insmod.c
index e55d9fa..0da0a39 100644
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -81,7 +81,7 @@
 #ifndef MODUTILS_MODULE_H
 static const int MODUTILS_MODULE_H = 1;
 
-#ident "$Id: insmod.c,v 1.45 2001/01/31 19:00:21 kraai Exp $"
+#ident "$Id: insmod.c,v 1.46 2001/02/14 21:23:06 andersen Exp $"
 
 /* This file contains the structures used by the 2.0 and 2.1 kernels.
    We do not use the kernel headers directly because we do not wish
@@ -287,7 +287,7 @@ int delete_module(const char *);
 #ifndef MODUTILS_OBJ_H
 static const int MODUTILS_OBJ_H = 1;
 
-#ident "$Id: insmod.c,v 1.45 2001/01/31 19:00:21 kraai Exp $"
+#ident "$Id: insmod.c,v 1.46 2001/02/14 21:23:06 andersen Exp $"
 
 /* The relocatable object is manipulated using elfin types.  */
 
@@ -2916,12 +2916,12 @@ extern int insmod_main( int argc, char **argv)
 				 * loading the same module 50 times concurrently. */
 				break;
 			default:
-				usage(insmod_usage);
+				show_usage();
 		}
 	}
 	
 	if (argv[optind] == NULL) {
-		usage(insmod_usage);
+		show_usage();
 	}
 
 	/* Grab the module name */
diff --git a/modutils/rmmod.c b/modutils/rmmod.c
index 3a66af8..7d4538e 100644
--- a/modutils/rmmod.c
+++ b/modutils/rmmod.c
@@ -39,7 +39,7 @@ extern int rmmod_main(int argc, char **argv)
 {
 	int ret = EXIT_SUCCESS;
 	if (argc <= 1) {
-		usage(rmmod_usage);
+		show_usage();
 	}
 
 	/* Parse any options */
@@ -52,7 +52,7 @@ extern int rmmod_main(int argc, char **argv)
 					perror_msg_and_die("rmmod");
 				return EXIT_SUCCESS;
 			default:
-				usage(rmmod_usage);
+				show_usage();
 			}
 		}
 	}
-- 
cgit v1.1