From nobody Tue Mar 14 15:58:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PbdV20V9Lz3yQM1; Tue, 14 Mar 2023 15:58:18 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PbdV16s4sz4F8C; Tue, 14 Mar 2023 15:58:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678809498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=thnFvPD7/bYesASiNrh331F8YE3jwH0l4MkOVOL5afo=; b=BKOIv/MbRLt4Vn+KP4wcKG5jOawbJt7K6dUndFMiJWI6WIfIr2RqTEcV2YbqKU7g5QyYA5 H1+wcfXPfUblTR6rw+8K7MgGHH2WbnbO9fbwc5vmh0vzwAnjW4WKAEtq4un73vX83zPbor d2gXTfgO6mW4091OIk610BVli+xn7Ykjb1aOa4kCzoeNIfobWyL1aBp+QoJ5J1tJUDy4LB Kk6spLIGviu/z9CoimVKElPFo36HNSxtNuNgVoyMZrt53Gh022LempWj25k05FNBxfZ26Y TrAc8kICsHbtgKCtJ3DviWTM+HA6+ENe/Ffxsu2w6x77ZpgiX6Fynf4p7aGUcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678809498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=thnFvPD7/bYesASiNrh331F8YE3jwH0l4MkOVOL5afo=; b=yHUgKYYxGKGhxq1xktS3zE5PEjixHGxhFUawMaUDDBO8LGT3FOW3bhGG6vm2NRplsigMv3 /OHkmCok0p5vEvDJrVsjcAoJ7vq6eLP7AkNZZoOlifw/oJB98H0+rGDycHoO7VcaOeTvNq 951mxFXa7FT4uRi5x8UaCOI2dS6Zw9qZpPiA3tFWsjkzxQIu0OcrWNCvl5fwRenl7biC8x TK7bokxkBwKXGNC/AgGo1SQiiFeV9s93QlhgiRubzgzkTEFTKz0fXd0jI9Aalj7EozoDIJ KCEKdoIGOFdr3n6aTt/cWtJjxO4SXn5otx0V1m+nAhM4p2sN8hnaL2sBD59dQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678809498; a=rsa-sha256; cv=none; b=NvBrK/CHzDQiDKVXisi02go8qwC8P0w7ndfsG1nodzJ3j9VtNWOPDZ+AHzXaI4+QC4Ep0D BtEfrPUeo6BeaN3n1afdvSL+3ATItUMAARFQIZ8qQ0OjDRqD7lnnSUNB0yrUqpfb5NFmuZ P8dUXrsZXNRfvy0UfLvbPGam4tXb6gMNC6MirT4LT4eKRoiKWSxjH78l+c4aFl4L8BjDQY O2tMxxEZDgtADj2RqaeTF+8HYMTQToMy+ItPk+eVmizFLQaSuhdzkWDq0YJk6zqCzedNoe tOh64KvHijPtVkLR2A4PFetCh59810gitFMAqatjsgiPwbYObxHF7UvI6QyVhQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PbdV15xngzhT7; Tue, 14 Mar 2023 15:58:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32EFwHib007905; Tue, 14 Mar 2023 15:58:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32EFwHpq007904; Tue, 14 Mar 2023 15:58:17 GMT (envelope-from git) Date: Tue, 14 Mar 2023 15:58:17 GMT Message-Id: <202303141558.32EFwHpq007904@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: f32d6f745d0e - main - ping6: Use errx to avoid appending a specious error message List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f32d6f745d0ef7ca045fc5946fa8d02e86afcf47 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f32d6f745d0ef7ca045fc5946fa8d02e86afcf47 commit f32d6f745d0ef7ca045fc5946fa8d02e86afcf47 Author: Jose Luis Duran AuthorDate: 2023-03-14 15:08:54 +0000 Commit: Mark Johnston CommitDate: 2023-03-14 15:58:02 +0000 ping6: Use errx to avoid appending a specious error message Reviewed by: asomers, markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D38418 --- sbin/ping/ping6.c | 2 +- sbin/ping/tests/test_ping.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/sbin/ping/ping6.c b/sbin/ping/ping6.c index 74d36f0357f8..5449d02a5d56 100644 --- a/sbin/ping/ping6.c +++ b/sbin/ping/ping6.c @@ -580,7 +580,7 @@ ping6(int argc, char *argv[]) case 'W': t = strtod(optarg, &e); if (*e || e == optarg || t > (double)INT_MAX) - err(EX_USAGE, "invalid timing interval: `%s'", + errx(EX_USAGE, "invalid timing interval: `%s'", optarg); options |= F_WAITTIME; waittime = (int)t; diff --git a/sbin/ping/tests/test_ping.py b/sbin/ping/tests/test_ping.py index 913948d18b3e..186790853314 100644 --- a/sbin/ping/tests/test_ping.py +++ b/sbin/ping/tests/test_ping.py @@ -736,7 +736,6 @@ PING6(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::2 "stdout": "", "stderr": "ping: invalid timing interval: `x'\n", }, - marks=pytest.mark.skip("XXX currently failing"), id="_Wx_localhost", ), ]