From owner-svn-src-projects@freebsd.org Fri Mar 22 19:15:15 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D7BC2154F216 for ; Fri, 22 Mar 2019 19:15:15 +0000 (UTC) (envelope-from ngie@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 7C65F8FCDB; Fri, 22 Mar 2019 19:15:15 +0000 (UTC) (envelope-from ngie@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 539B324BA0; Fri, 22 Mar 2019 19:15:15 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2MJFFES007192; Fri, 22 Mar 2019 19:15:15 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2MJFFB7007191; Fri, 22 Mar 2019 19:15:15 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201903221915.x2MJFFB7007191@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Fri, 22 Mar 2019 19:15:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r345423 - projects/capsicum-test/contrib/capsicum-test X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/capsicum-test/contrib/capsicum-test X-SVN-Commit-Revision: 345423 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7C65F8FCDB X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.959,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Mar 2019 19:15:16 -0000 Author: ngie Date: Fri Mar 22 19:15:14 2019 New Revision: 345423 URL: https://svnweb.freebsd.org/changeset/base/345423 Log: Fix a -Wdangling-else issue with g++ g++ fails to compile capability-fd.cc with the following issues, ad nauseum: ``` contrib/capsicum-test/capability-fd.cc: In function 'void TryDirOps(int, cap_rights_t)': contrib/capsicum-test/capability-fd.cc:716:6: error: suggest explicit braces to avoid ambiguous 'else' [-Werror=dangling-else] if (rc >= 0) EXPECT_OK(close(rc)); ``` Wrap the `EXPECT_OK(..)` macro with do-while so it's properly treated like a code block, as `EXPECT_LT(..)` expands to a much larger block of code. Modified: projects/capsicum-test/contrib/capsicum-test/capsicum-test.h Modified: projects/capsicum-test/contrib/capsicum-test/capsicum-test.h ============================================================================== --- projects/capsicum-test/contrib/capsicum-test/capsicum-test.h Fri Mar 22 19:08:48 2019 (r345422) +++ projects/capsicum-test/contrib/capsicum-test/capsicum-test.h Fri Mar 22 19:15:14 2019 (r345423) @@ -134,7 +134,10 @@ const char *TmpFile(const char *pathname); void ICLASS_NAME(test_case_name, test_name)::InnerTestBody() // Emit errno information on failure -#define EXPECT_OK(v) EXPECT_LE(0, v) << " errno " << errno << " " << strerror(errno) +#define EXPECT_OK(v) \ + do { \ + EXPECT_LE(0, v) << " errno " << errno << " " << strerror(errno); \ + } while (0) // Expect a syscall to fail with the given error. #define EXPECT_SYSCALL_FAIL(E, C) \