MFC r357223:

Merge r357222 from the clang1000-import branch:

Fix the following -Werror warning from clang 10.0.0 in rbootd:

libexec/rbootd/rmpproto.c:335:49: error: multiple unsequenced modifications to 'filename' [-Werror,-Wunsequenced]
        filename = (filename = strrchr(filepath,'/'))? ++filename: filepath;
                 ~                                     ^
This commit is contained in:
Dimitry Andric 2020-02-04 19:19:48 +00:00
parent 8bbbe7519d
commit 564462232a
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/stable/10/; revision=357517

View File

@ -330,7 +330,8 @@ SendBootRepl(struct rmp_packet *req, RMPCONN *rconn, char *filelist[])
* stripped file name and spoof the client into thinking that it
* really got what it wanted.
*/
filename = (filename = strrchr(filepath,'/'))? ++filename: filepath;
filename = strrchr(filepath,'/');
filename = filename? filename + 1: filepath;
/*
* Check that this is a valid boot file name.