svn commit: r242593 - head/sbin/hastd

Pawel Jakub Dawidek pjd at FreeBSD.org
Mon Nov 5 00:38:15 UTC 2012


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 {				\


More information about the svn-src-head mailing list