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
This commit is contained in:
ngie 2016-05-22 19:06:38 +00:00
parent 5a6f3a2a93
commit bc6177838f

View File

@ -103,7 +103,10 @@ copy_yp_pass(char *p, int x, int m)
} }
t = buf; 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); EXPAND(yp_password.pw_name);
yp_password.pw_fields |= _PWF_NAME; yp_password.pw_fields |= _PWF_NAME;
EXPAND(yp_password.pw_passwd); EXPAND(yp_password.pw_passwd);