From owner-svn-src-stable-12@freebsd.org Tue Feb 4 19:19:48 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E2C45230929; Tue, 4 Feb 2020 19:19:48 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48Bvdw5dcNz4Nxm; Tue, 4 Feb 2020 19:19:48 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BC9201E992; Tue, 4 Feb 2020 19:19:48 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 014JJm0I046557; Tue, 4 Feb 2020 19:19:48 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 014JJmNP046556; Tue, 4 Feb 2020 19:19:48 GMT (envelope-from dim@FreeBSD.org) Message-Id: <202002041919.014JJmNP046556@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Tue, 4 Feb 2020 19:19:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r357517 - in stable: 10/libexec/rbootd 11/libexec/rbootd 12/libexec/rbootd X-SVN-Group: stable-12 X-SVN-Commit-Author: dim X-SVN-Commit-Paths: in stable: 10/libexec/rbootd 11/libexec/rbootd 12/libexec/rbootd X-SVN-Commit-Revision: 357517 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Feb 2020 19:19:49 -0000 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/12/libexec/rbootd/rmpproto.c Directory Properties: stable/12/ (props changed) Changes in other areas also in this revision: Modified: stable/10/libexec/rbootd/rmpproto.c stable/11/libexec/rbootd/rmpproto.c Directory Properties: stable/10/ (props changed) stable/11/ (props changed) Modified: stable/12/libexec/rbootd/rmpproto.c ============================================================================== --- stable/12/libexec/rbootd/rmpproto.c Tue Feb 4 19:15:57 2020 (r357516) +++ stable/12/libexec/rbootd/rmpproto.c Tue Feb 4 19:19:48 2020 (r357517) @@ -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.