From owner-svn-src-head@FreeBSD.ORG  Fri Jan 16 21:12:37 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8A0E2159;
 Fri, 16 Jan 2015 21:12:37 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 755D2F92;
 Fri, 16 Jan 2015 21:12:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0GLCb36095996;
 Fri, 16 Jan 2015 21:12:37 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0GLCblS095995;
 Fri, 16 Jan 2015 21:12:37 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201501162112.t0GLCblS095995@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
 using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Fri, 16 Jan 2015 21:12:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r277272 - head/contrib/ofed/management/opensm/osmtest
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jan 2015 21:12:37 -0000

Author: ngie
Date: Fri Jan 16 21:12:36 2015
New Revision: 277272
URL: https://svnweb.freebsd.org/changeset/base/277272

Log:
  Don't call abort on usage errors; print out the usage message instead
  
  PR: 196793
  MFC after: 3 days
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/contrib/ofed/management/opensm/osmtest/main.c

Modified: head/contrib/ofed/management/opensm/osmtest/main.c
==============================================================================
--- head/contrib/ofed/management/opensm/osmtest/main.c	Fri Jan 16 21:08:04 2015	(r277271)
+++ head/contrib/ofed/management/opensm/osmtest/main.c	Fri Jan 16 21:12:36 2015	(r277272)
@@ -565,8 +565,9 @@ int main(int argc, char *argv[])
 			printf("Done with args\n");
 			break;
 
-		default:	/* something wrong */
-			abort();
+		default:
+			show_usage();
+			return 1;
 		}
 
 	}