From nobody Mon Jun 29 15:52:18 2026 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 4gprPv33JNz6jNg3 for ; Mon, 29 Jun 2026 15:52:19 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gprPv01V7z3LGL for ; Mon, 29 Jun 2026 15:52:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782748339; 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=vOM3M98/HoK+rhZndnFtscel8+8ykS9X9reTgfHOg/M=; b=O2XAkRIvqjY0HYcAQHIQNrWk94/yJlCEpJiLbh+xYWwDLFjxtA/KEF9yWBnVUrfoF66JpN qRDOAjUH30wvGiiQfw2HDg0DmEdrUQsaq+RY7iYtMqRcSWib73ysYQxkBSvOGj+qPHygAl urSkNOWe8nJx9Bf78aqbUCTkS7sBrFvW7AIZo4+Gr2VFusLVPt7DiMwc4qEaf2yxo+70GH EmYc3dxkpDEy+WFZ8cXKZQGilt85h4cASX7ICmX5e8fDjvLJJjLT+C8szX4MpyqZODTC6F gxx+LTdWTTZxgvuBpmTUoG7xu6s6V2q+GdLnZB0LVPQvwBie8DQxWllLUzHzrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782748339; a=rsa-sha256; cv=none; b=lm3Cuae4j4Vbw/1TR8j8q16UOLmkcfoK339+a46lDueD6sMO60V4YIoRPimdW4w87EhfQV AAxMVK9sRuKzclKcnoVFAKczXMW7J0+xEKFKEixUhCyYKDtGDLJcY4HkscVTM4vwlBJewO QDAU5S70Zom9O/OhBv5QtddNDq7yV+NYz1H1d5yMZZBQ7KRxG7mCYQF1VC+fQFpMvK3uBx enZ09Ip9LuI31aeaI5pmsbDrslWMd/2VJIQPW8PTRXafDUYSpl4bMOl4EX8YJQ+bh/ibGW J/QMiFlL1yLpMshdGyYojyFJracfQUneiX9PK02RPmTp1RH7qXKDUeGBkjWxMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782748339; 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=vOM3M98/HoK+rhZndnFtscel8+8ykS9X9reTgfHOg/M=; b=l07TX1zH/8YnfHr45uOpzxUP7xXvQftJuYdHrpYHSc53zKP4E8KlXxBVKZVFZsX8EFspoC PLX8PT8rh2g7ThBWj0cBfgFjt15huh5Wb0vW3kwDCC0UOJ17gTPlttUQx9u0zHE8GrbCBt x76H9BnFUMPKYlBUW3hiX50K17KjLZNryvnbO7UzBxFKeorKKinIXGfYGy/LrRhdHOGgWQ vsGqc4m1UGRjFt3uZW7J3h+MaPJuS6j1IKiK/E5C8NagsLh+cqBxQj/a/Opk8d9vzN6KIJ 8ON1ocHunPNMxx9tNW7zIWWVzfGTaXXujA9r5MzCSz5vhQnEjbl6KLK6dAlzJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gprPt5lMsz13g8 for ; Mon, 29 Jun 2026 15:52:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ba41 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Jun 2026 15:52:18 +0000 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=B8rg?=rav Subject: git: 672cb7320a27 - main - libfetch: Make fetch_ref an inline 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 672cb7320a2754788bddf5cd026721b6f70a0d30 Auto-Submitted: auto-generated Date: Mon, 29 Jun 2026 15:52:18 +0000 Message-Id: <6a4294b2.3ba41.3f1ec11a@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=672cb7320a2754788bddf5cd026721b6f70a0d30 commit 672cb7320a2754788bddf5cd026721b6f70a0d30 Author: Dag-Erling Smørgrav AuthorDate: 2026-06-29 13:29:10 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-29 13:49:20 +0000 libfetch: Make fetch_ref an inline Make fetch_ref() an inline and provide a fetch_deref(). MFC after: 1 week --- lib/libfetch/common.c | 11 ----------- lib/libfetch/common.h | 13 ++++++++++++- lib/libfetch/ftp.c | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c index d1a897b98827..74748e5b7d17 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -300,17 +300,6 @@ fetch_reopen(int sd) } -/* - * Bump a connection's reference count. - */ -conn_t * -fetch_ref(conn_t *conn) -{ - ++conn->ref; - return (conn); -} - - /* * Resolve an address */ diff --git a/lib/libfetch/common.h b/lib/libfetch/common.h index 5ad9bde513a0..143d4fe82945 100644 --- a/lib/libfetch/common.h +++ b/lib/libfetch/common.h @@ -61,6 +61,18 @@ struct fetchconn { int ref; /* reference count */ }; +static inline conn_t *fetch_ref(conn_t *conn) +{ + ++conn->ref; + return (conn); +} + +static inline conn_t *fetch_deref(conn_t *conn) +{ + --conn->ref; + return (conn); +} + /* Structure used for error message lists */ struct fetcherr { const int num; @@ -115,7 +127,6 @@ struct addrinfo *fetch_resolve(const char *, int, int); int fetch_bind(int, int, const char *); conn_t *fetch_connect(const char *, int, int, int); conn_t *fetch_reopen(int); -conn_t *fetch_ref(conn_t *); #ifdef WITH_SSL int fetch_ssl_cb_verify_crt(int, X509_STORE_CTX*); #endif diff --git a/lib/libfetch/ftp.c b/lib/libfetch/ftp.c index fc096054c9a2..5e4148e0fa2c 100644 --- a/lib/libfetch/ftp.c +++ b/lib/libfetch/ftp.c @@ -1133,7 +1133,7 @@ ftp_request(struct url *url, const char *op, struct url_stat *us, /* just a stat */ if (strcmp(op, "STAT") == 0) { - --conn->ref; + fetch_deref(conn); ftp_disconnect(conn); return (FILE *)1; /* bogus return value */ }