git: f32d6f745d0e - main - ping6: Use errx to avoid appending a specious error message

The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=f32d6f745d0ef7ca045fc5946fa8d02e86afcf47

commit f32d6f745d0ef7ca045fc5946fa8d02e86afcf47
Author:     Jose Luis Duran <jlduran@gmail.com>
AuthorDate: 2023-03-14 15:08:54 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
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",
         ),
     ]