MFstable/10 r301619:

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

git-svn-id: svn://svn.freebsd.org/base/stable/9@301620 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f