From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from localhost (fantadrom.bsd.lv [local])
	by fantadrom.bsd.lv (OpenSMTPD) with ESMTPA id 1e504aab
	for <source@mandoc.bsd.lv>;
	Fri, 14 Jul 2017 11:50:09 -0500 (EST)
Date: Fri, 14 Jul 2017 11:50:09 -0500 (EST)
Message-Id: <1379674590760034393.enqueue@fantadrom.bsd.lv>
X-Mailinglist: mandoc-source
Reply-To: source@mandoc.bsd.lv
MIME-Version: 1.0
From: schwarze@mandoc.bsd.lv
To: source@mandoc.bsd.lv
Subject: mandoc: Explicitly initialize a variable where the compiler is 
X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/
Content-Type: text/plain; charset=utf-8

Log Message:
-----------
Explicitly initialize a variable where the compiler is (understandably)
unable to figure out that it is never used uninitialized.  
While here, tweak the content of the variable to make its usage 
easier to understand.  No functional change.

Modified Files:
--------------
    mandoc:
        roff.c

Revision Data
-------------
Index: roff.c
===================================================================
RCS file: /home/cvs/mandoc/mandoc/roff.c,v
retrieving revision 1.322
retrieving revision 1.323
diff -Lroff.c -Lroff.c -u -p -r1.322 -r1.323
--- roff.c
+++ roff.c
@@ -1127,13 +1127,13 @@ roff_res(struct roff *r, struct buf *buf
 	size_t		 maxl;  /* expected length of the escape name */
 	size_t		 naml;	/* actual length of the escape name */
 	enum mandoc_esc	 esc;	/* type of the escape sequence */
-	enum mandoc_os	 os_e;	/* kind of RCS id seen */
 	int		 inaml;	/* length returned from mandoc_escape() */
 	int		 expand_count;	/* to avoid infinite loops */
 	int		 npos;	/* position in numeric expression */
 	int		 arg_complete; /* argument not interrupted by eol */
 	int		 done;	/* no more input available */
 	int		 deftype; /* type of definition to paste */
+	int		 rcsid;	/* kind of RCS id seen */
 	char		 term;	/* character terminating the escape */
 
 	/* Search forward for comments. */
@@ -1149,20 +1149,21 @@ roff_res(struct roff *r, struct buf *buf
 
 		/* Comment found, look for RCS id. */
 
+		rcsid = 0;
 		if ((cp = strstr(stesc, "$" "OpenBSD")) != NULL) {
-			os_e = MANDOC_OS_OPENBSD;
+			rcsid = 1 << MANDOC_OS_OPENBSD;
 			cp += 8;
 		} else if ((cp = strstr(stesc, "$" "NetBSD")) != NULL) {
-			os_e = MANDOC_OS_NETBSD;
+			rcsid = 1 << MANDOC_OS_NETBSD;
 			cp += 7;
 		}
 		if (cp != NULL &&
 		    isalnum((unsigned char)*cp) == 0 &&
 		    strchr(cp, '$') != NULL) {
-			if (r->man->meta.rcsids & (1 << os_e))
+			if (r->man->meta.rcsids & rcsid)
 				mandoc_msg(MANDOCERR_RCS_REP, r->parse,
 				    ln, stesc + 1 - buf->buf, stesc + 1);
-			r->man->meta.rcsids |= 1 << os_e;
+			r->man->meta.rcsids |= rcsid;
 		}
 
 		/* Handle trailing whitespace. */
--
 To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv