Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 8 Jun 2016 13:49:59 +0000 (UTC)
From:      Garrett Cooper <ngie@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r301619 - stable/10/usr.sbin/rpc.yppasswdd
Message-ID:  <201606081349.u58Dnx8s044447@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ngie
Date: Wed Jun  8 13:49:59 2016
New Revision: 301619
URL: https://svnweb.freebsd.org/changeset/base/301619

Log:
  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/10/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
==============================================================================
--- stable/10/usr.sbin/rpc.yppasswdd/yppasswdd_server.c	Wed Jun  8 13:45:02 2016	(r301618)
+++ stable/10/usr.sbin/rpc.yppasswdd/yppasswdd_server.c	Wed Jun  8 13:49:59 2016	(r301619)
@@ -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);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606081349.u58Dnx8s044447>