From owner-svn-src-head@FreeBSD.ORG  Tue Mar 30 19:07:42 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 489F1106566B;
	Tue, 30 Mar 2010 19:07:42 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 38AB58FC22;
	Tue, 30 Mar 2010 19:07:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2UJ7gLK067301;
	Tue, 30 Mar 2010 19:07:42 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2UJ7g7W067299;
	Tue, 30 Mar 2010 19:07:42 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201003301907.o2UJ7g7W067299@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 30 Mar 2010 19:07:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r205900 - head/lib/libstand
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Tue, 30 Mar 2010 19:07:42 -0000

Author: jhb
Date: Tue Mar 30 19:07:41 2010
New Revision: 205900
URL: http://svn.freebsd.org/changeset/base/205900

Log:
  Use panic() (which the environment is required to provide to libstand) to
  implement assert() instead of relying on a non-required exit().  The exit()
  invocation also did not match the semantics of the exit() routine that
  current boot environments happen to require.
  
  PR:		kern/144749
  Discussed with:	bde
  MFC after:	1 week

Modified:
  head/lib/libstand/assert.c

Modified: head/lib/libstand/assert.c
==============================================================================
--- head/lib/libstand/assert.c	Tue Mar 30 19:06:54 2010	(r205899)
+++ head/lib/libstand/assert.c	Tue Mar 30 19:07:41 2010	(r205900)
@@ -35,10 +35,10 @@ void
 __assert(const char *func, const char *file, int line, const char *expression)
 {
 	if (func == NULL)
-		printf("Assertion failed: (%s), file %s, line %d.\n",
+		panic("Assertion failed: (%s), file %s, line %d.\n",
 		    expression, file, line);
 	else
-		printf("Assertion failed: (%s), function %s, file %s, line "
-		    "%d.\n", expression, func, file, line);
-	exit();
+		panic(
+		    "Assertion failed: (%s), function %s, file %s, line %d.\n",
+		    expression, func, file, line);
 }