From nobody Mon Jul 13 06:45:49 2026 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 4gzCcs6TJMz6kSqQ for ; Mon, 13 Jul 2026 06:45:49 +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 4gzCcs3MySz3khX for ; Mon, 13 Jul 2026 06:45:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783925149; 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=EfDokqcqDVK7C04kz+XBRWGTG5eoFf++nYl2yygacdw=; b=buzn1zM0NpAAqJxFyDZUmpnb9DG5KRl01fDMQkRs+Su9aPIZEoV+OkaMUz/zpV1m+Ljsxg AsC2rCjAsivCpLE29a3pOtkjFkT4lN5wh76Z3ebGZ3DOK9eljwsbbCIZnZQuzcZC9GR7JQ EEf5dPxPq1uCRkcqXAqseO6kYcdVg3nf9ZhktWmG7bPXgBrHUzrPzBfKvykf44QMb+EjT/ IPhIE6f4+VmUbozCfT70oC2qvUay5dQ0ZHA1htbfajAb3sBTdbWtO200a3KH4eQ6/dseLL g22SOirfLFF1hlrNIMY9jEb6VXjokfs4gfkBIyy8uO2BaNQ0mtxOYpgzdeh4nA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783925149; a=rsa-sha256; cv=none; b=BD0HhjM9cNcZ5eU9xQfMVSmSoJKb6Vkq/bqw5dw2mm93JypGvOHRK+V2q2g2HsJ9JAD97L B1c5CiWmUKLmYvFqzm0G7O8OCm3XJNS4FQHAm8fs8eMKsEWb0xkT3YVYBznurhxvJShpVG WPQFg20cBkHcm+wmTUA64kw0GbrTfaIYAZ2z0xH6sUpVskV0UfMWCrWcvSdRzOHQkY0NgI Bmd6qTiFxS0RRmeDV3/T+I1owEKEO+1A0GBMFE1fRKiowzPswoXgxJKYnCFlE9f4VEG2wL znPyC6CWHPPOfCVXuvU+EDTb3EgCgOgv+JBYnfXUnBBzVoN3rkx8bjAw+D2PXg== 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=1783925149; 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=EfDokqcqDVK7C04kz+XBRWGTG5eoFf++nYl2yygacdw=; b=PE34Ch6cMXdTO8u608LQViP3HMhauno+xfhAjUrO+SqtVbC2I7yWs4Vf3FDAKXtoT7f12z WeA4YmcLQxGKwHL+srh9D/kdTQpeGSaY29Hm4dxyqyGGAm/6yehRim5VjD2dY1ct/W6Uow EdeHeDEN2arhVThmXX5PRcwKC+i/XxKfmvJixHvDkwFE5rZ+leepyKm3YE8aH6qFBl7+NU ho+5gbfpEzivwKpCKH4V+zuYIdODtN4deGzvuQRLCx3kVNk4Hc4nPMl9R+ZNqXgYG2kLfO Rg5GmVIo32ViPfOUriE3wPBSSuyuuijcLPFhvWrRCTIPcqxaCWXm/YrRzJGMpA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gzCcs0q6hznXQ for ; Mon, 13 Jul 2026 06:45:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20d63 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Jul 2026 06:45:49 +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: d4e0e1fbc237 - main - libfetch: Make fetch_ref an inline 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: d4e0e1fbc237f0765b9f32b291c087348031c921 Auto-Submitted: auto-generated Date: Mon, 13 Jul 2026 06:45:49 +0000 Message-Id: <6a54899d.20d63.355abb93@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d4e0e1fbc237f0765b9f32b291c087348031c921 commit d4e0e1fbc237f0765b9f32b291c087348031c921 Author: Dag-Erling Smørgrav AuthorDate: 2026-07-13 06:43:51 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-07-13 06:43:51 +0000 libfetch: Make fetch_ref an inline Make fetch_ref() an inline and provide a fetch_deref(). MFC after: 1 week Reviewed by: op Differential Revision: https://reviews.freebsd.org/D57944 --- 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 */ }