From nobody Mon Jun 29 15:54:17 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 4gprS94WXjz6jP5q for ; Mon, 29 Jun 2026 15:54: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gprS92ylQz3Q93 for ; Mon, 29 Jun 2026 15:54:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782748457; 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=qGdl5safuTlyM42S8FVZOrbY6DNCnYD+z5TUV8qjTM0=; b=WKmECbVGhkvN9n1ez+snvyp/oR0wciDuAnf/wypHJln//eOgtLt3MxSGt3ZHpu6pPmoC3A LmKrkC68kisLK1Vqs0cFwC6KOLj367pPRHXzRWHtYzgNQqq9fLLzbbyqQHPl7WN/PXu1DH Ea7/GTVh4Y6LkL4T4rNYW6e1371cSZpZ873acxvI0JK3PQTg6UJt6oSXrDr+iRHXNG88FK JH5Ywk1bEfxogD9vjgwhkhGTCHiuHPAEkfj7vThuZfn8rgu27rbNVBXzv00e4QV9+/aPS+ A8Pqu6G6Sc6lisvtoIN39+GQBMd7shsjNaSErmOlQZlm7njXNcSVRKcZ9arX5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782748457; a=rsa-sha256; cv=none; b=p5m9iRviBkxgOLUiHv0NIB/LQTXiGRgFnWyIx3mVIGE+ol9Y0lXRj1O6H9GZ8ixfD55EyY 7re30ijY2MlCBSn73iTs+pH+PoaFGCYppag4wRFpkw1FYHu+6Z0VvVubbNYgzHWm1g+wjK 8PLear62FOtiZMUkeZzYHSM6TJVDTIt5WKq9EgUJH9oLUw4zK6+J3rD04GNcrkJNZ+IXvw 3X1RqRxElCce63i4aFkf1rGYxlGyQa9UdzwtsDwejiCW17fe5qWu+dJU4z/bw3eBNbEW1k efqIC9HFuf3B5eF057heiSgswpy2D8IPA33qCD2eUfspQxy7YhoQIhPf48eP/g== 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=1782748457; 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=qGdl5safuTlyM42S8FVZOrbY6DNCnYD+z5TUV8qjTM0=; b=VVCs79lGNE3g2wdL+M2gtXXWgl3YswPMpN7g3ivSgsMFtiwMFt70l76cOrgDxY0rjm9ZSi Uh14PPbe4XgLqWn3bI9rgxd96T0yQXQ0TnILhkC/sCO+qmx/nzkiiffAYVSWFamULXumpe oDVrPh7KtTzA9dVYn7D4EUa0mVs21HKPYi1sJeAVLhzFGYW+RTS+7pn4A0krf2wj56M6Hh tCfrsp/5am0wEFAiwBfqAxPIIfbX35UAuucNk6dRqsOuyoE+3cnA4speKAJqzexACBHoZM efGpdi63v9MyuYR0TIvIpeA1rEhhVipW3zPtMyp8Ypd3oL0jnOA6rXA8bSCX6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gprS918qJz13sY for ; Mon, 29 Jun 2026 15:54:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b81b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Jun 2026 15:54:17 +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: d40b35f8eb1d - main - Revert "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: d40b35f8eb1dbab430d595193ddb1c950766bcac Auto-Submitted: auto-generated Date: Mon, 29 Jun 2026 15:54:17 +0000 Message-Id: <6a429529.3b81b.26bc712f@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d40b35f8eb1dbab430d595193ddb1c950766bcac commit d40b35f8eb1dbab430d595193ddb1c950766bcac Author: Dag-Erling Smørgrav AuthorDate: 2026-06-29 15:53:53 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-29 15:53:53 +0000 Revert "libfetch: Make fetch_ref an inline" This reverts commit 672cb7320a2754788bddf5cd026721b6f70a0d30. --- 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 74748e5b7d17..d1a897b98827 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -300,6 +300,17 @@ 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 143d4fe82945..5ad9bde513a0 100644 --- a/lib/libfetch/common.h +++ b/lib/libfetch/common.h @@ -61,18 +61,6 @@ 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; @@ -127,6 +115,7 @@ 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 5e4148e0fa2c..fc096054c9a2 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) { - fetch_deref(conn); + --conn->ref; ftp_disconnect(conn); return (FILE *)1; /* bogus return value */ }