Author: dim
Date: Tue Feb 4 19:19:48 2020
New Revision: 357517
URL: https://svnweb.freebsd.org/changeset/base/357517
Log:
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;
~ ^
Modified:
stable/10/libexec/rbootd/rmpproto.c
Directory Properties:
stable/10/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/11/libexec/rbootd/rmpproto.c
stable/12/libexec/rbootd/rmpproto.c
Directory Properties:
stable/11/ (props changed)
stable/12/ (props changed)
Modified: stable/10/libexec/rbootd/rmpproto.c
==============================================================================
--- stable/10/libexec/rbootd/rmpproto.c Tue Feb 4 19:15:57 2020
(r357516)
+++ stable/10/libexec/rbootd/rmpproto.c Tue Feb 4 19:19:48 2020
(r357517)
@@ -330,7 +330,8 @@ SendBootRepl(struct rmp_packet *req, RMPCONN *rconn, c
* 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.
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
