From owner-svn-src-projects@FreeBSD.ORG  Mon Jan 19 07:14:37 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D5873737;
 Mon, 19 Jan 2015 07:14: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 C157AEC3;
 Mon, 19 Jan 2015 07:14: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 t0J7Ebic044991;
 Mon, 19 Jan 2015 07:14:37 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0J7Eb2v044990;
 Mon, 19 Jan 2015 07:14:37 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201501190714.t0J7Eb2v044990@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: Mon, 19 Jan 2015 07:14:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r277366 -
 projects/stable-10-opts-mk/contrib/ofed/management/opensm/osmtest
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Jan 2015 07:14:37 -0000

Author: ngie
Date: Mon Jan 19 07:14:36 2015
New Revision: 277366
URL: https://svnweb.freebsd.org/changeset/base/277366

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

Modified:
  projects/stable-10-opts-mk/contrib/ofed/management/opensm/osmtest/main.c
Directory Properties:
  projects/stable-10-opts-mk/   (props changed)

Modified: projects/stable-10-opts-mk/contrib/ofed/management/opensm/osmtest/main.c
==============================================================================
--- projects/stable-10-opts-mk/contrib/ofed/management/opensm/osmtest/main.c	Mon Jan 19 07:10:08 2015	(r277365)
+++ projects/stable-10-opts-mk/contrib/ofed/management/opensm/osmtest/main.c	Mon Jan 19 07:14:36 2015	(r277366)
@@ -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;
 		}
 
 	}