From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from krisdoz.my.domain (schwarze@localhost [127.0.0.1])
	by krisdoz.my.domain (8.14.5/8.14.5) with ESMTP id s6UK6cXM018149
	for <source@mdocml.bsd.lv>; Wed, 30 Jul 2014 16:06:38 -0400 (EDT)
Received: (from schwarze@localhost)
	by krisdoz.my.domain (8.14.5/8.14.3/Submit) id s6UK6amV001755;
	Wed, 30 Jul 2014 16:06:36 -0400 (EDT)
Date: Wed, 30 Jul 2014 16:06:36 -0400 (EDT)
Message-Id: <201407302006.s6UK6amV001755@krisdoz.my.domain>
X-Mailinglist: mdocml-source
Reply-To: source@mdocml.bsd.lv
MIME-Version: 1.0
From: schwarze@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: mdocml: Simplify: replace one global flag by one local variable.
X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/
Content-Type: text/plain; charset=utf-8

Log Message:
-----------
Simplify: replace one global flag by one local variable.
No functional change.

Modified Files:
--------------
    mdocml:
        libman.h
        man.c

Revision Data
-------------
Index: man.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man.c,v
retrieving revision 1.133
retrieving revision 1.134
diff -Lman.c -Lman.c -u -p -r1.133 -r1.134
--- man.c
+++ man.c
@@ -478,10 +478,11 @@ man_ptext(struct man *man, int line, cha
 static int
 man_pmacro(struct man *man, int ln, char *buf, int offs)
 {
-	int		 i, ppos;
-	enum mant	 tok;
 	char		 mac[5];
 	struct man_node	*n;
+	enum mant	 tok;
+	int		 i, ppos;
+	int		 bline;
 
 	if ('"' == buf[offs]) {
 		mandoc_msg(MANDOCERR_COMMENT_BAD, man->parse,
@@ -581,14 +582,9 @@ man_pmacro(struct man *man, int ln, char
 		man->flags &= ~MAN_BLINE;
 	}
 
-	/*
-	 * Save the fact that we're in the next-line for a block.  In
-	 * this way, embedded roff instructions can "remember" state
-	 * when they exit.
-	 */
+	/* Remember whether we are in next-line scope for a block head. */
 
-	if (MAN_BLINE & man->flags)
-		man->flags |= MAN_BPLINE;
+	bline = man->flags & MAN_BLINE;
 
 	/* Call to handler... */
 
@@ -610,11 +606,10 @@ man_pmacro(struct man *man, int ln, char
 	 * above-parsed macro, so return.
 	 */
 
-	if ( ! (MAN_BPLINE & man->flags)) {
+	if ( ! bline) {
 		man->flags &= ~MAN_ILINE;
 		return(1);
 	}
-	man->flags &= ~MAN_BPLINE;
 
 	/*
 	 * If we're in a block scope, then allow this macro to slip by
Index: libman.h
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/libman.h,v
retrieving revision 1.59
retrieving revision 1.60
diff -Llibman.h -Llibman.h -u -p -r1.59 -r1.60
--- libman.h
+++ libman.h
@@ -31,7 +31,6 @@ struct	man {
 #define	MAN_BLINE	(1 << 2) /* Next-line block scope. */
 #define	MAN_ILINE	(1 << 3) /* Ignored in next-line scope. */
 #define	MAN_LITERAL	(1 << 4) /* Literal input. */
-#define	MAN_BPLINE	(1 << 5)
 #define	MAN_NEWLINE	(1 << 6) /* first macro/text in a line */
 	enum man_next	 next; /* where to put the next node */
 	struct man_node	*last; /* the last parsed node */
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv