From owner-svn-src-stable@freebsd.org  Wed Jun  8 13:50:49 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id F1D24B6E1B6;
 Wed,  8 Jun 2016 13:50:49 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id BF0C91239;
 Wed,  8 Jun 2016 13:50:49 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u58Domel044561;
 Wed, 8 Jun 2016 13:50:48 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u58DomTb044560;
 Wed, 8 Jun 2016 13:50:48 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201606081350.u58DomTb044560@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Wed, 8 Jun 2016 13:50:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r301620 - stable/9/usr.sbin/rpc.yppasswdd
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Jun 2016 13:50:50 -0000

Author: ngie
Date: Wed Jun  8 13:50:48 2016
New Revision: 301620
URL: https://svnweb.freebsd.org/changeset/base/301620

Log:
  MFstable/10 r301619:
  
  MFC r300430:
  
  Wrap EXPAND(..) macro with a do-while(0) loop and put a single statement on each line
  
  As a positive side-effect, this eliminates the double semicolons reported by Coverity:
  the macro contained a trailing semicolon, in addition to the semicolon placed on
  each line where EXPAND(..) was called.
  
  CID: 1194269

Modified:
  stable/9/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
Directory Properties:
  stable/9/   (props changed)
  stable/9/usr.sbin/   (props changed)
  stable/9/usr.sbin/rpc.yppasswdd/   (props changed)

Modified: stable/9/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
==============================================================================
--- stable/9/usr.sbin/rpc.yppasswdd/yppasswdd_server.c	Wed Jun  8 13:49:59 2016	(r301619)
+++ stable/9/usr.sbin/rpc.yppasswdd/yppasswdd_server.c	Wed Jun  8 13:50:48 2016	(r301620)
@@ -103,7 +103,10 @@ copy_yp_pass(char *p, int x, int m)
 	}
 
 	t = buf;
-#define EXPAND(e)       e = t; while ((*t++ = *p++));
+#define EXPAND(e) do { \
+	e = t; \
+	while ((*t++ = *p++)); \
+} while (0)
         EXPAND(yp_password.pw_name);
 	yp_password.pw_fields |= _PWF_NAME;
         EXPAND(yp_password.pw_passwd);