From owner-svn-src-stable-9@FreeBSD.ORG  Sat Jan 24 03:04:09 2015
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@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 62CCEF38;
 Sat, 24 Jan 2015 03:04:09 +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 4E265CB0;
 Sat, 24 Jan 2015 03:04:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0O349bL081178;
 Sat, 24 Jan 2015 03:04:09 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0O349UZ081177;
 Sat, 24 Jan 2015 03:04:09 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201501240304.t0O349UZ081177@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: Sat, 24 Jan 2015 03:04:09 +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: r277636 - stable/9/contrib/ofed/management/opensm/osmtest
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-9@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9/>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 24 Jan 2015 03:04:09 -0000

Author: ngie
Date: Sat Jan 24 03:04:08 2015
New Revision: 277636
URL: https://svnweb.freebsd.org/changeset/base/277636

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

Modified:
  stable/9/contrib/ofed/management/opensm/osmtest/main.c
Directory Properties:
  stable/9/   (props changed)
  stable/9/contrib/   (props changed)

Modified: stable/9/contrib/ofed/management/opensm/osmtest/main.c
==============================================================================
--- stable/9/contrib/ofed/management/opensm/osmtest/main.c	Sat Jan 24 02:16:53 2015	(r277635)
+++ stable/9/contrib/ofed/management/opensm/osmtest/main.c	Sat Jan 24 03:04:08 2015	(r277636)
@@ -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;
 		}
 
 	}