From mboxrd@z Thu Jan  1 00:00:00 1970
From: teigland@sourceware.org <teigland@sourceware.org>
Date: 21 Nov 2007 17:50:16 -0000
Subject: [Cluster-devel] cluster/group/gfs_controld lock_dlm.h
Message-ID: <20071121175016.19197.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL5
Changes by:	teigland at sourceware.org	2007-11-21 17:50:16

Modified files:
	group/gfs_controld: lock_dlm.h 

Log message:
	ASSERT was doing fprintf(stderr) which goes somewhere we don't want
	when running as a daemon.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/gfs_controld/lock_dlm.h.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.21.2.8&r2=1.21.2.9

--- cluster/group/gfs_controld/lock_dlm.h	2007/09/04 19:27:34	1.21.2.8
+++ cluster/group/gfs_controld/lock_dlm.h	2007/11/21 17:50:15	1.21.2.9
@@ -105,13 +105,12 @@
 } while (0)
 
 #define ASSERT(x) \
-{ \
+do { \
 	if (!(x)) { \
-		fprintf(stderr, "\nAssertion failed on line %d of file %s\n\n" \
-			"Assertion:  \"%s\"\n", \
-			__LINE__, __FILE__, #x); \
-        } \
-}
+		log_error("Assertion failed on line %d of file %s\n" \
+			  "Assertion:  \"%s\"\n", __LINE__, __FILE__, #x); \
+	} \
+} while (0)
 
 struct mountpoint {
 	struct list_head	list;