From nobody Thu Nov 10 17:02:27 2022 X-Original-To: dev-commits-src-branches@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 4N7SnH4BNPz4dNKX; Thu, 10 Nov 2022 17:02:27 +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 4N7SnH3b3Fz3hk9; Thu, 10 Nov 2022 17:02:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668099747; 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=VuQ6S2rpWsWwiZPvl1uz/8+dF3hSzyL+VF5iD8wdbGs=; b=vnHBG/N5SaRUlbfptJPJI28chaOuOaXXgNY2LF8gnXxf7wQpYf6cmU+tpc6TUjCo6b1iXg +ha9QD6KWdUH88JZ1Senc4rnkA7VU6Hl8RruufRCYb8oRoEBvAo1XwVgUBATmg1qzcpE3I NA80qTlazbye6WV01Tqn/4cPtcR+G74kvVA2wEJ/7tlDAdVwoYXt9g2WL2+V+vOqlt0CoI 04JIvI8cM0Hzlkl3C79CEBJ5Z4Qlh2bNa6AF66pSDb7x2XcKCg6OIWYWDqmg7OooWv/9bs CK9152UtLCy3NxSR98QA9n9p3d2QpDfqK40Z2fZATW7uWOKjhsbczCMXH1LZsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668099747; 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=VuQ6S2rpWsWwiZPvl1uz/8+dF3hSzyL+VF5iD8wdbGs=; b=VUMzHEpHPGGEXpJFIKr5tCw5jLrjg7D3gR5Qp+FIDelSE6i36oZ9OTl/BIrAD+eRibohZS SaOefJWY7sF44LG0JYBY0z0ELzxmiFDPFCKO6dmr23884BXy4tpgA8A+3Kgn5BZ02qeOxa aw66Jdfx08u0oOsHGmW0pdMkFPa8ZA4X8oArOyYxAdxz2Bx/7RvgCM+A5l/55m5xzjyv4S tBFuYnJoiXVvnJjNHjWP1tc6vIqAFQkDC+bgXMmQLAENtOZh3nQzlta4CJq1x8QaPmKyB8 I5gaEPljeV9SVMuRpL9p1jguBHZJ9aWjiobORa/aYNGMrR0hOoxLnJwfK0HscA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668099747; a=rsa-sha256; cv=none; b=xMMt75JhnGjQUIrtPbp2Jzau9A70QAqK7OqLi/4Hsqaq74X9xEeYMHbWNAN1LY3EMpT+8P f9GAT5y1wv6ORKbYUG5BSMuucZ8Vq5W6bNk6jN6UZlR+0PfCoTRJLgCk9hDBPccH46e1Yg wv9yAUpg1ssE4XbwW8ZfYETu8jI212J2YUQi7YV/g13+eDJk3v4ULF7LLtKWAqIcfJ2NLb qiP+9jgRYSjsGMcpWq0pknJOwULzOYMuOLWTVzb2EeIguMPaGbWICjWowupwM/OM+TFAvB ZafKAKgSnS9bXIWBuqWqv36PGpK3nmr8UGPtynNmuXZy+R0ktSZ2j9oHyRpVFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4N7SnH2gQyz17t5; Thu, 10 Nov 2022 17:02:27 +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 2AAH2Rw2016247; Thu, 10 Nov 2022 17:02:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AAH2RYH016246; Thu, 10 Nov 2022 17:02:27 GMT (envelope-from git) Date: Thu, 10 Nov 2022 17:02:27 GMT Message-Id: <202211101702.2AAH2RYH016246@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 92a6c0f781d3 - stable/13 - ping: main.c: Consistent use of white space/tabs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 92a6c0f781d3aa324b6c737061bfb954375ae9fd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=92a6c0f781d3aa324b6c737061bfb954375ae9fd commit 92a6c0f781d3aa324b6c737061bfb954375ae9fd Author: Jose Luis Duran AuthorDate: 2022-11-01 05:19:22 +0000 Commit: Mark Johnston CommitDate: 2022-11-10 17:01:29 +0000 ping: main.c: Consistent use of white space/tabs If a user has tabs set at a value other than 8, the output of the usage may not be consistently aligned. % tabs -2 Before: % ping usage: ping [-4AaDdfHnoQqRrv] [-C pcp] [-c count] [-G sweepmaxsize] [-g sweepminsize] [-h sweepincrsize] [-i wait] [-l preload] [-M mask | time] [-m ttl] [-P policy] [-p pattern] [-S src_addr] [-s packetsize] [-t timeout] [-W waittime] [-z tos] IPv4-host ping [-4AaDdfHLnoQqRrv] [-C pcp] [-c count] [-I iface] [-i wait] [-l preload] [-M mask | time] [-m ttl] [-P policy] [-p pattern] [-S src_addr] [-s packetsize] [-T ttl] [-t timeout] [-W waittime] [-z tos] IPv4-mcast-group ping [-6AaDdfHnNoOquvyY] [-b bufsiz] [-c count] [-e gateway] [-I interface] [-i wait] [-k addrtype] [-l preload] [-m hoplimit] [-p pattern] [-P policy] [-S sourceaddr] [-s packetsize] [-t timeout] [-W waittime] [-z tclass] [IPv6-hops ...] IPv6-host After: % ping usage: ping [-4AaDdfHnoQqRrv] [-C pcp] [-c count] [-G sweepmaxsize] [-g sweepminsize] [-h sweepincrsize] [-i wait] [-l preload] [-M mask | time] [-m ttl] [-P policy] [-p pattern] [-S src_addr] [-s packetsize] [-t timeout] [-W waittime] [-z tos] IPv4-host ping [-4AaDdfHLnoQqRrv] [-C pcp] [-c count] [-I iface] [-i wait] [-l preload] [-M mask | time] [-m ttl] [-P policy] [-p pattern] [-S src_addr] [-s packetsize] [-T ttl] [-t timeout] [-W waittime] [-z tos] IPv4-mcast-group ping [-6AaDdfHnNoOquvyY] [-b bufsiz] [-c count] [-e gateway] [-I interface] [-i wait] [-k addrtype] [-l preload] [-m hoplimit] [-p pattern] [-P policy] [-S sourceaddr] [-s packetsize] [-t timeout] [-W waittime] [-z tclass] [IPv6-hops ...] IPv6-host Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D37246 (cherry picked from commit 526e8a7d5db390d1cbf490d8e1e0b41e057d81bf) --- sbin/ping/main.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/sbin/ping/main.c b/sbin/ping/main.c index 11fa17b5ce2d..fce58e05bd2f 100644 --- a/sbin/ping/main.c +++ b/sbin/ping/main.c @@ -180,48 +180,48 @@ usage(void) #ifdef INET "\tping [-4AaDdfHnoQqRrv] [-C pcp] [-c count] " "[-G sweepmaxsize]\n" - " [-g sweepminsize] [-h sweepincrsize] [-i wait] " + "\t [-g sweepminsize] [-h sweepincrsize] [-i wait] " "[-l preload]\n" - " [-M mask | time] [-m ttl] " + "\t [-M mask | time] [-m ttl] " #ifdef IPSEC "[-P policy] " #endif "[-p pattern] [-S src_addr] \n" - " [-s packetsize] [-t timeout] [-W waittime] [-z tos] " + "\t [-s packetsize] [-t timeout] [-W waittime] [-z tos] " "IPv4-host\n" "\tping [-4AaDdfHLnoQqRrv] [-C pcp] [-c count] [-I iface] " "[-i wait]\n" - " [-l preload] [-M mask | time] [-m ttl] " + "\t [-l preload] [-M mask | time] [-m ttl] " #ifdef IPSEC "[-P policy] " #endif "[-p pattern]\n" - " [-S src_addr] [-s packetsize] [-T ttl] [-t timeout] [-W waittime]\n" - " [-z tos] IPv4-mcast-group\n" + "\t [-S src_addr] [-s packetsize] [-T ttl] [-t timeout] [-W waittime]\n" + "\t [-z tos] IPv4-mcast-group\n" #endif /* INET */ #ifdef INET6 - "\tping [-6AaDd" + "\tping [-6AaDd" #if defined(IPSEC) && !defined(IPSEC_POLICY_IPSEC) - "E" + "E" #endif - "fHnNoOq" + "fHnNoOq" #ifdef IPV6_USE_MIN_MTU - "u" + "u" #endif - "vyY" + "vyY" #if defined(IPSEC) && !defined(IPSEC_POLICY_IPSEC) - "Z" + "Z" #endif "] " - "[-b bufsiz] [-c count] [-e gateway]\n" - " [-I interface] [-i wait] [-k addrtype] [-l preload] " - "[-m hoplimit]\n" - " [-p pattern]" + "[-b bufsiz] [-c count] [-e gateway]\n" + "\t [-I interface] [-i wait] [-k addrtype] [-l preload] " + "[-m hoplimit]\n" + "\t [-p pattern]" #if defined(IPSEC) && defined(IPSEC_POLICY_IPSEC) - " [-P policy]" + " [-P policy]" #endif - " [-S sourceaddr] [-s packetsize] [-t timeout]\n" - " [-W waittime] [-z tclass] [IPv6-hops ...] IPv6-host\n" + " [-S sourceaddr] [-s packetsize] [-t timeout]\n" + "\t [-W waittime] [-z tclass] [IPv6-hops ...] IPv6-host\n" #endif /* INET6 */ );