From owner-svn-src-head@FreeBSD.ORG  Mon Nov  5 00:38:14 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id DF980F0D;
 Mon,  5 Nov 2012 00:38:14 +0000 (UTC) (envelope-from pjd@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 C4F4E8FC15;
 Mon,  5 Nov 2012 00:38:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA50cEVj089440;
 Mon, 5 Nov 2012 00:38:14 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA50cEVG089438;
 Mon, 5 Nov 2012 00:38:14 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201211050038.qA50cEVG089438@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Mon, 5 Nov 2012 00:38:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r242593 - head/sbin/hastd
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.14
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: Mon, 05 Nov 2012 00:38:15 -0000

Author: pjd
Date: Mon Nov  5 00:38:14 2012
New Revision: 242593
URL: http://svnweb.freebsd.org/changeset/base/242593

Log:
  Revert r228695. We use __func__ here as a format to distinguish between
  abort and assert. It would be cleaner to use NULL or "" here, but gcc
  complains in both cases.

Modified:
  head/sbin/hastd/pjdlog.h

Modified: head/sbin/hastd/pjdlog.h
==============================================================================
--- head/sbin/hastd/pjdlog.h	Mon Nov  5 00:29:25 2012	(r242592)
+++ head/sbin/hastd/pjdlog.h	Mon Nov  5 00:38:14 2012	(r242593)
@@ -95,7 +95,7 @@ void pjdlog_abort(const char *func, cons
 #define	PJDLOG_VERIFY(expr)	do {					\
 	if (!(expr)) {							\
 		pjdlog_abort(__func__, __FILE__, __LINE__, #expr,	\
-		    "%s", __func__);					\
+		    __func__);						\
 	}								\
 } while (0)
 #define	PJDLOG_RVERIFY(expr, ...)	do {				\