From nobody Thu Mar 10 16:26:25 2022 X-Original-To: dev-commits-src-main@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 7D1601A100A0; Thu, 10 Mar 2022 16:26:25 +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 4KDvZn38Pvz3s0J; Thu, 10 Mar 2022 16:26:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646929585; 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=qHWNF86ieTBazrbH5gatuxLa0KlPtD3GAOQli9FcyLs=; b=P+Fz54bKnGbauyLOkpXSTPEYPNGLVd3uXSy1bZ2Vjy6lTwtayRAYvQWH8Tq5Xu2WCwtvHH 8rJgCqCiP7iuVyDC+kFHkDrcL3HdA3PHmkeq98EBPYzUDV/dAL1GZQhNJcLqfLfrX0nH3g t7QPKNMKmVhBp0fpkXIMAmwzIFXmk6hbVzzN3sQAY13LvwNJ10Ll4PTtvjV25GmlT4FMbs HnDB9cs1waEKMX8AJgREPr5jwvDCq0z5Q4teta5k0XE2LarvzIAw/U9JIt24KNGJLX1hN0 5mWS0FKZuu3hyQg4FHEqZyJTOKSCUa1KT6lKy2PDbyL6KolyLz3KwxI6oanJZw== 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 47A6C4FC; Thu, 10 Mar 2022 16:26:25 +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 22AGQP0f034686; Thu, 10 Mar 2022 16:26:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22AGQPPo034685; Thu, 10 Mar 2022 16:26:25 GMT (envelope-from git) Date: Thu, 10 Mar 2022 16:26:25 GMT Message-Id: <202203101626.22AGQPPo034685@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tom Jones Subject: git: 93b7af1d854d - main - diff: Re-add void argument to usage List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 93b7af1d854db2a92dc9fcca70e068a159385f4d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646929585; 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=qHWNF86ieTBazrbH5gatuxLa0KlPtD3GAOQli9FcyLs=; b=lWteaQ5E7blhIapOhZaqJYdRFfxLoqYa9D40SrhNqSl1RVB0pIgK0K9ZKOE19c9EUch+ui Q904/O91Tsain4Cq6aSQV8mgtAD8MavOLSmjIiXyetaAhEiBUxjhzOMySrCdlCebYriqS1 8auSY79oODUbRH6ViP1ijbQiJD05qKYGqVxjXGGOeCLx3j64PI9czxuf0x35MzSAMCFW9f db2cDz70mICa/jwP6pS2m/2UoY0gxihCHVmAmOHT5dPcyIFQ4efr/eSQpK1D909v7pIeSa Ea4UEu73yGc+gZ/+fUrvTVlxFy5RSrmWoqahp77+HugM1tb3csPbC+TC/VXr8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646929585; a=rsa-sha256; cv=none; b=LGD+ZWpuHYHMeKeX83gJpIGOASMWBCNOECTCQWIgRfaMPKGsMmAoDh06a2lJkh1iIxEehN LYgsE+3hN1DH1tSH8VMYvROh5t5p9uQWcRRYR3BN7mYNBgXmJlLxaNh0yabUjGvlm0nh/O UOKn8g4kare9F4pFfX26wArYgZcfR21KnpKL9wr0tNBExFbDKQn2BNKdRky/LMdujSJvKk ZKgtr9Tx61OdpUVkfL71eSG79l7u4Tgs2uLGOGqBSEqbUAcCqlLPhQM+Vj0eOLA49C5Uii FEoaC7lIajJyv9QGoN5mhk6oiWdaZCm0Odq+zkKFLaUvrsQlQUP4iMgzIz5tGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=93b7af1d854db2a92dc9fcca70e068a159385f4d commit 93b7af1d854db2a92dc9fcca70e068a159385f4d Author: Tom Jones AuthorDate: 2022-03-10 16:24:02 +0000 Commit: Tom Jones CommitDate: 2022-03-10 16:24:02 +0000 diff: Re-add void argument to usage Previous commit (8cf449db88b2c7a505bc241a78f9736b43f2ede5) unintentionally dropped the 'void' argument to usage, reinstate it. Sponsored by: Klara Inc. --- usr.bin/diff/diff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c index ba6bc7c3a310..8b8b1f65c07b 100644 --- a/usr.bin/diff/diff.c +++ b/usr.bin/diff/diff.c @@ -582,7 +582,7 @@ print_status(int val, char *path1, char *path2, const char *entry) } static void -usage() +usage(void) { (void)fprintf(help ? stdout : stderr, "usage: diff [-aBbdilpTtw] [-c | -e | -f | -n | -q | -u] [--ignore-case]\n"