From nobody Mon Dec 5 14:29:44 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 4NQmCX3VZ9z4jrX2; Mon, 5 Dec 2022 14:29:44 +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 4NQmCX30X3z3QLt; Mon, 5 Dec 2022 14:29:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670250584; 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=pcAYRw3DQLma5VkSbBkmOQBxqMFbRqMcqXJVgFs9TrM=; b=olc2UMT4uCzpSNB7csalHLe5ZokFYM4VOQapUcfz3tnk8YK1MXlD+HkeM8yzKdw4jxalzO wvsMMrPoMHiCaQm/NI729j/UunN5groh+fJfhkdiuZabxXmLcZTOw9DroX8kfJ02SoJTiT C4qethIk+JxGkveWM0o/ArXrLLwTQbc62D3a1k2QnPgEtCtQDRIxyANEXZgwovbRVfNRju qOr8MW59vMT18ohYAZbhUjXkFH6o9aXhcwQmo+YREjtGfoh93/YSEHGBZRmH1sK+njcYpx lwVeqqrNrHLcarNcul0z3NW/Nkmqz09vaQNd30nWI2OXnJTDraMspg8XN2GLKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670250584; 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=pcAYRw3DQLma5VkSbBkmOQBxqMFbRqMcqXJVgFs9TrM=; b=Coa/NMmHmVSQXYrxA6y6aek1J6/k9YNmex3xhapifXmFfsLdRJ19S+HmOBxFho8f6QQ7bT mUz4FYTZ4oGnyiUY3AzeOeKSaXa6EYelZ7mZd6LmdaUFg/sivMJYcxp4yrd4rog6NSUR1g fCRU1TvsTw4kdiEvSZkSfjMVAStcj1QA1IfXv/Lxis746A8OQedZnie2YU/Qk57qMQVN2X /6zlw3A1JGPow8gSfqE3A7kC8uQX79aABciTf1Q4hglyrsc9JLiLqT/0QgDQ/lcUJmyjLJ GXosKVFAfzs01hC+/53yIoTLsR3AZ7/7m7FplixXcBtDHDjF9V5HGq7U2ZYFIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670250584; a=rsa-sha256; cv=none; b=WLiEgz7inzhpAb34wSd0MyhyijDFq23kvVKZ+aWi1h8W+AbXqrmlYa3lGrwHGURpHw7JiW /u22a9Rkc4Zi3VBUmXyTelZBL+Zls1tE3kmU265ixDzYuoXbtN6qCloYx7WHZQSS1Ix4y/ ybO1aIJaXIW0303hLlOtX6y/pmMfsYRK9HmKHTXVRkVSjXAHBJksFTgmTo6IexoDS3zrr+ oBYiZ0QPZhw9az217Tor7EZvPZu1GKPqc+qh3ddci2pA2uId6UmGDE6gIu2FhGIaWYzqbR 1mQfSlJ/+qLbjC6TyR9x1kmxVUpU5EVcEe+LxswSvQCIJbkN5Sgf9+K7qnQI0Q== 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 4NQmCX1nfcz11Qm; Mon, 5 Dec 2022 14:29:44 +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 2B5ETiUh055204; Mon, 5 Dec 2022 14:29:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B5ETiwG055203; Mon, 5 Dec 2022 14:29:44 GMT (envelope-from git) Date: Mon, 5 Dec 2022 14:29:44 GMT Message-Id: <202212051429.2B5ETiwG055203@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Poul-Henning Kamp Subject: git: c2ddf2edb4aa - main - tree.h: Fix SP/TAB white-space issues, add () for clarity. 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: phk X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c2ddf2edb4aa4026e2de860d0a450306516b73d8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by phk: URL: https://cgit.FreeBSD.org/src/commit/?id=c2ddf2edb4aa4026e2de860d0a450306516b73d8 commit c2ddf2edb4aa4026e2de860d0a450306516b73d8 Author: Poul-Henning Kamp AuthorDate: 2022-12-05 14:28:56 +0000 Commit: Poul-Henning Kamp CommitDate: 2022-12-05 14:28:56 +0000 tree.h: Fix SP/TAB white-space issues, add () for clarity. --- sys/sys/tree.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/sys/sys/tree.h b/sys/sys/tree.h index edd32d9dec2a..b488e56ae9e8 100644 --- a/sys/sys/tree.h +++ b/sys/sys/tree.h @@ -165,7 +165,7 @@ static __unused __inline struct type * \ name##_SPLAY_MIN_MAX(struct name *head, int val) \ { \ name##_SPLAY_MINMAX(head, val); \ - return (SPLAY_ROOT(head)); \ + return (SPLAY_ROOT(head)); \ } /* Main splay operation. @@ -565,7 +565,7 @@ name##_RB_INSERT_COLOR(struct name *head, \ * Exactly one of the edges descending from elm \ * is long. The long one is in the same \ * direction as the edge from parent to elm, \ - * so change that by rotation. The edge from \ + * so change that by rotation. The edge from \ * parent to z was shortened above. Shorten \ * the long edge down from elm, and adjust \ * other edge lengths based on the downward \ @@ -576,9 +576,9 @@ name##_RB_INSERT_COLOR(struct name *head, \ * elm z / z \ * / \ child \ * / child / \ \ - * / / \ elm \ \ + * / / \ elm \ \ * w / \ / \ y \ - * x y w \ \ + * x y w \ \ * x \ */ \ RB_ROTATE(elm, child, elmdir, field); \ @@ -690,15 +690,15 @@ name##_RB_REMOVE_COLOR(struct name *head, \ * \ * par par \ * / \ / \ \ - * / sib elm \ \ + * / sib elm \ \ * / / \ elm* \ - * elm elm* \ / \ \ - * / \ \ / \ \ - * / \ z / \ \ - * x y x sib \ + * elm elm* \ / \ \ + * / \ \ / \ \ + * / \ z / \ \ + * x y x sib \ * / \ \ * / z \ - * y \ + * y \ */ \ elm = _RB_LINK(sib, elmdir, field); \ /* elm is a 1-child. First rotate at elm. */ \ @@ -772,7 +772,7 @@ name##_RB_REMOVE(struct name *head, struct type *out) \ in = RB_RIGHT(out, field); \ opar = _RB_UP(out, field); \ if (in == NULL || child == NULL) { \ - in = child = in == NULL ? child : in; \ + in = child = (in == NULL ? child : in); \ parent = opar = _RB_PTR(opar); \ } else { \ parent = in; \