From owner-svn-src-head@freebsd.org  Tue Jan 28 20:05:26 2020
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 7F1BD23AD5F;
 Tue, 28 Jan 2020 20:05:26 +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 486czp2gCQz4T5W;
 Tue, 28 Jan 2020 20:05:26 +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 569C9631;
 Tue, 28 Jan 2020 20:05:26 +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 00SK5Qd1079940;
 Tue, 28 Jan 2020 20:05:26 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00SK5QcB079939;
 Tue, 28 Jan 2020 20:05:26 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <202001282005.00SK5QcB079939@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Tue, 28 Jan 2020 20:05:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r357223 - head/libexec/rbootd
X-SVN-Group: head
X-SVN-Commit-Author: dim
X-SVN-Commit-Paths: head/libexec/rbootd
X-SVN-Commit-Revision: 357223
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Jan 2020 20:05:26 -0000

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.