From nobody Fri Jun 20 14:10:17 2025 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 4bNzrn74Scz5y4vd; Fri, 20 Jun 2025 14:10:17 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bNzrn6ZnVz3m3X; Fri, 20 Jun 2025 14:10:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750428617; 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=qc4sJ2qZcnGP3izjVVMnyqCt+Z297Y7ziNy8JROMTq0=; b=XBoyO9tcOKpQ6SVlCWRnweUXm+V0211QKGtaOyKbtjysMigsyfNEUi4W4rvbD2WU1slfzJ CBxmZPgvOi1ke6/S/kxf97CskQ3gOihAJAvWy9dEc8uHZ7CQmGLYaJTOoJJUhQvPtPpP1O fvJc+78smB90gbws4pdgjdU/gVx9YErEl90ZouilPRA4KiWbRWIJfokY4uTC5abH4ZXIZ4 KqqBgkyc2KomorOSOyB8pqjApK8VgjBGGzOdTExV82krHjS76Ox1So/T4jDJ5VeOPi/EvA 0kvvfwlcHxU8ryNN2NDcRMOVe79+fc0iksY6rCAKbts5YcCF/A2s5DLoO3hLzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750428617; 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=qc4sJ2qZcnGP3izjVVMnyqCt+Z297Y7ziNy8JROMTq0=; b=Vl3OtUcc05vYp1iwhqjb9eWWdVV+5Dub7Oc9yAkJFlJpyppfL/DSOc0pkS2Q29JOL/p9KL 5NJpj3jGBmyTtGmrlybJEkmkdiT06O7p0e4QWu0IXyZji9b690hO5RYGNBCw+FdCV8C+aD KvM6/yx4AGm5tomjY1rC3+ig1Pg0JmySIRKL0unZ1sbtczJmqSMiazHjQUWmNlC855Nk/J r+RaBA52yX2+h2vKagGVEO9SWuynBg3o04LF+ea+wzSOO6a0UcccE3WOsJp0PLfh8oyF7+ md/nQCX1i3wxt7phBuXm03F+FWNwVCzmaVWx3jJV40ve15ATh2+QWwM5VDJfCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750428617; a=rsa-sha256; cv=none; b=O6Wl9O+hyxgN246uXwvPG5DHPDELNaFxeTBHo4wLx/PGPDkYxT7lLYL24/UlPdqk7Gzz7K HPdB1TqP22uMVJi5Fc0BrDADpsqhMJ9tr46PzTHQu0g9eqB3OVfza8gcwK28yyvefIBdpt 5r0z4tAolD1b9g7foaQp3EG4Ao2puNQmjNfGEHpF7kneNI31JVWwEPwUBFOcbOpAr9Us/P aLDj5rn4Y8wYwCk0pYx9WddhFHiSZEx3ys6c0cwyL0JrySLNoJ55Hnj6ZeHbKAkC6/qxvY 7DwKc+wag0VP7v6Tx+Ms/RqbLMEymjtAN89orJXR2H2t6pIybv9FJLQ6533H8g== 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 4bNzrn5sgMzpPk; Fri, 20 Jun 2025 14:10:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55KEAHKQ088717; Fri, 20 Jun 2025 14:10:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55KEAHJM088712; Fri, 20 Jun 2025 14:10:17 GMT (envelope-from git) Date: Fri, 20 Jun 2025 14:10:17 GMT Message-Id: <202506201410.55KEAHJM088712@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 9f1e4ea64ab5 - main - diff: Whitespace nits. 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9f1e4ea64ab541e51df0440b43ee35a98ba63d73 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=9f1e4ea64ab541e51df0440b43ee35a98ba63d73 commit 9f1e4ea64ab541e51df0440b43ee35a98ba63d73 Author: Dag-Erling Smørgrav AuthorDate: 2025-06-20 14:09:39 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-06-20 14:09:39 +0000 diff: Whitespace nits. Sponsored by: Klara, Inc. --- usr.bin/diff/diff.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/usr.bin/diff/diff.h b/usr.bin/diff/diff.h index 679b95e7ca94..74be55db8a33 100644 --- a/usr.bin/diff/diff.h +++ b/usr.bin/diff/diff.h @@ -108,21 +108,21 @@ struct excludes { struct excludes *next; }; -extern bool lflag, Nflag, Pflag, rflag, sflag, Tflag, cflag; -extern bool ignore_file_case, suppress_common, color, noderef, algorithm_set; -extern int diff_format, diff_context, diff_algorithm, status; -extern bool diff_algorithm_set; -extern int tabsize, width; +extern bool lflag, Nflag, Pflag, rflag, sflag, Tflag, cflag; +extern bool ignore_file_case, suppress_common, color, noderef, algorithm_set; +extern int diff_format, diff_context, diff_algorithm, status; +extern bool diff_algorithm_set; +extern int tabsize, width; extern char *start, *ifdefname, *diffargs, *label[2]; extern char *ignore_pats, *most_recent_pat; extern char *group_format; extern const char *add_code, *del_code; -extern struct stat stb1, stb2; -extern struct excludes *excludes_list; -extern regex_t ignore_re, most_recent_re; +extern struct stat stb1, stb2; +extern struct excludes *excludes_list; +extern regex_t ignore_re, most_recent_re; -int diffreg(char *, char *, int, int); -int diffreg_new(char *, char *, int, int); -bool can_libdiff(int); -void diffdir(char *, char *, int); -void print_status(int, char *, char *, const char *); +int diffreg(char *, char *, int, int); +int diffreg_new(char *, char *, int, int); +bool can_libdiff(int); +void diffdir(char *, char *, int); +void print_status(int, char *, char *, const char *);