diff options
author | ngie <ngie@FreeBSD.org> | 2016-05-22 19:06:38 +0000 |
---|---|---|
committer | ngie <ngie@FreeBSD.org> | 2016-05-22 19:06:38 +0000 |
commit | bc6177838f0ca448d8be5f15d5aaa572bc0e9fdc (patch) | |
tree | c43a6507ae15b616e07c835dfdb992c697951b0e /usr.sbin/rpc.yppasswdd/yppasswdd_server.c | |
parent | 5a6f3a2a93febf866fd1114407f195b0ca692669 (diff) | |
download | FreeBSD-src-bc6177838f0ca448d8be5f15d5aaa572bc0e9fdc.zip FreeBSD-src-bc6177838f0ca448d8be5f15d5aaa572bc0e9fdc.tar.gz |
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.
MFC after: 1 week
Reported by: Coverity
CID: 1194269
Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'usr.sbin/rpc.yppasswdd/yppasswdd_server.c')
-rw-r--r-- | usr.sbin/rpc.yppasswdd/yppasswdd_server.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.sbin/rpc.yppasswdd/yppasswdd_server.c b/usr.sbin/rpc.yppasswdd/yppasswdd_server.c index 9eb874b..ae5ca59 100644 --- a/usr.sbin/rpc.yppasswdd/yppasswdd_server.c +++ b/usr.sbin/rpc.yppasswdd/yppasswdd_server.c @@ -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); |