Date: Tue, 28 Jan 2020 20:05:26 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r357223 - head/libexec/rbootd Message-ID: <202001282005.00SK5QcB079939@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Tue Jan 28 20:05:25 2020 New Revision: 357223 URL: https://svnweb.freebsd.org/changeset/base/357223 Log: 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; ~ ^ MFC after: 3 days Modified: head/libexec/rbootd/rmpproto.c Directory Properties: head/ (props changed) Modified: head/libexec/rbootd/rmpproto.c ============================================================================== --- head/libexec/rbootd/rmpproto.c Tue Jan 28 19:19:55 2020 (r357222) +++ head/libexec/rbootd/rmpproto.c Tue Jan 28 20:05:25 2020 (r357223) @@ -332,7 +332,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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001282005.00SK5QcB079939>