From owner-svn-src-stable@FreeBSD.ORG Wed Jul 3 23:42:13 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 25BC3C91; Wed, 3 Jul 2013 23:42:13 +0000 (UTC) (envelope-from jimharris@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id F27041EE5; Wed, 3 Jul 2013 23:42:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r63NgCLH065671; Wed, 3 Jul 2013 23:42:12 GMT (envelope-from jimharris@svn.freebsd.org) Received: (from jimharris@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r63NgCEb065669; Wed, 3 Jul 2013 23:42:12 GMT (envelope-from jimharris@svn.freebsd.org) Message-Id: <201307032342.r63NgCEb065669@svn.freebsd.org> From: Jim Harris Date: Wed, 3 Jul 2013 23:42:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r252655 - stable/9/sbin/nvmecontrol X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jul 2013 23:42:13 -0000 Author: jimharris Date: Wed Jul 3 23:42:12 2013 New Revision: 252655 URL: http://svnweb.freebsd.org/changeset/base/252655 Log: MFC r252264: Add separate *_usage() functions for each nvmecontrol command. Sponsored by: Intel Modified: stable/9/sbin/nvmecontrol/nvmecontrol.c Directory Properties: stable/9/sbin/nvmecontrol/ (props changed) Modified: stable/9/sbin/nvmecontrol/nvmecontrol.c ============================================================================== --- stable/9/sbin/nvmecontrol/nvmecontrol.c Wed Jul 3 23:40:43 2013 (r252654) +++ stable/9/sbin/nvmecontrol/nvmecontrol.c Wed Jul 3 23:42:12 2013 (r252655) @@ -289,6 +289,14 @@ open_dev(const char *str, int *fd, int s } static void +devlist_usage(void) +{ + fprintf(stderr, "usage:\n"); + fprintf(stderr, DEVLIST_USAGE); + exit(EX_USAGE); +} + +static void devlist(int argc, char *argv[]) { struct nvme_controller_data cdata; @@ -302,7 +310,7 @@ devlist(int argc, char *argv[]) while ((ch = getopt(argc, argv, "")) != -1) { switch ((char)ch) { default: - usage(); + devlist_usage(); } } @@ -347,6 +355,14 @@ devlist(int argc, char *argv[]) } static void +identify_usage(void) +{ + fprintf(stderr, "usage:\n"); + fprintf(stderr, IDENTIFY_USAGE); + exit(EX_USAGE); +} + +static void identify_ctrlr(int argc, char *argv[]) { struct nvme_controller_data cdata; @@ -362,7 +378,7 @@ identify_ctrlr(int argc, char *argv[]) hexflag = 1; break; default: - usage(); + identify_usage(); } } @@ -382,7 +398,7 @@ identify_ctrlr(int argc, char *argv[]) if (verboseflag == 1) { printf("-v not currently supported without -x.\n"); - usage(); + identify_usage(); } print_controller(&cdata); @@ -407,7 +423,7 @@ identify_ns(int argc, char *argv[]) hexflag = 1; break; default: - usage(); + identify_usage(); } } @@ -454,7 +470,7 @@ identify_ns(int argc, char *argv[]) if (verboseflag == 1) { printf("-v not currently supported without -x.\n"); - usage(); + identify_usage(); } print_namespace(&nsdata); @@ -467,7 +483,7 @@ identify(int argc, char *argv[]) char *target; if (argc < 2) - usage(); + identify_usage(); while (getopt(argc, argv, "vx") != -1) ; @@ -624,6 +640,14 @@ perftest(int argc, char *argv[]) } static void +reset_usage(void) +{ + fprintf(stderr, "usage:\n"); + fprintf(stderr, RESET_USAGE); + exit(EX_USAGE); +} + +static void reset_ctrlr(int argc, char *argv[]) { int ch, fd; @@ -631,7 +655,7 @@ reset_ctrlr(int argc, char *argv[]) while ((ch = getopt(argc, argv, "")) != -1) { switch ((char)ch) { default: - usage(); + reset_usage(); } }