From nobody Sun Oct 16 00:32:28 2022 X-Original-To: dev-commits-src-branches@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 4Mqh0X2YZsz4g56f; Sun, 16 Oct 2022 00:32:28 +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 4Mqh0X250Yz3W2L; Sun, 16 Oct 2022 00:32:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665880348; 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=c8HckvZf5tPPyWfhEWRWwP9LRn0zJDkFi+3BaZzE460=; b=ava/pS8oHOxrqvSDnBbcdJ5ob7W3cV9rs0RTY/0cOtFtrAPZJPfryh3nCLJjk9TsMg5Dw5 r2+1t60x9neXMdiN+gNYK/Ct+9r7uAXECfwpYhiwOQksRLLS+7o2eswb/OAMr7uZ0FrTIj JnGr1TQ95U3t+PYSpF3KkKqEPSlXeW9Rl7O/8XnGBry5fHmniYNsiEZzByWaFPp1YRfGId ycvnMIjibFzHT2iWVIEfvGGQdinANLWEJKggIciLqxEHYM0ad/GoMoxnsa4eKGaqB0TDc6 dLZpxSUQ1h+A5NL03GTDmlY39abbsDyCk4hX5qJ1w3G6peXLZopVxQ0Qw9FNxQ== 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 4Mqh0X19HWzJ1n; Sun, 16 Oct 2022 00:32:28 +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 29G0WSVI085259; Sun, 16 Oct 2022 00:32:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29G0WSYJ085258; Sun, 16 Oct 2022 00:32:28 GMT (envelope-from git) Date: Sun, 16 Oct 2022 00:32:28 GMT Message-Id: <202210160032.29G0WSYJ085258@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 75c6ce75099c - stable/12 - ipfilter: Removed unused ioctl typedef List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 75c6ce75099cdeb40f144ad92a1c1a2357cee319 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665880348; 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=c8HckvZf5tPPyWfhEWRWwP9LRn0zJDkFi+3BaZzE460=; b=wIm4c++gTxRF6LaAlm1U1hzeYYpceqDwbuh2mgQD34jI3B8wAmsL5vP+hsGP/soc+YnJQB J1qM6lxnz80awENlWYPRt3djpLFbEHLSJ78h8tbX1cA5XNOnRk0ga+I/s5Kn8qPO+0zsbb SxhV+DdzIXPtfovsKFzv60ZUc8n5UFmbkaLrLpDBXHkcx/hmK2RxRzO2kt/IXWdLXLQwXj 9NPaKb1QeNGFG7dXZbhk4quHP1p7SVaAD5fHAp13Ttfcfsxscdat3Z8hjEIkkW1iZ4QPAW Oe1GCgz7elqfV1Y44XebIBVOS6JZba2iqWkHIgkz3HAFwhBlNl6qbegn/dAEDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665880348; a=rsa-sha256; cv=none; b=i9JVpmihFPS75f8sHUvRTCjGpWH03CHU4/i/kB5yUoQhFQ4kYyyaCa0KbncPVg5NT+SfeG 2iLFQKgVu2LLnC1MfLM9zKu/adwGSDt0c1IWqmstSH+q51gbVgsxAK0Q7PK/Qgj3r87sC4 mun1GCnRKeoZsdFpgIuZZvyudKKbavy0hIZW0pmF3d3TAldnU+6Qg3Qwtf2UiLYdwgg0YO rxBsQUBFycf9kPO58gCMnwLbONMnigFQ/Fod9DoSzoC5X2UMXjh2cqgst+13/L+8rOmf0n bjd86grjPdL4+iYdZ8LnmoJRKEHJhPuvyix2bYMFfdRf2TPT2fNW6Zer7SiELQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=75c6ce75099cdeb40f144ad92a1c1a2357cee319 commit 75c6ce75099cdeb40f144ad92a1c1a2357cee319 Author: Cy Schubert AuthorDate: 2022-10-07 10:05:53 +0000 Commit: Cy Schubert CommitDate: 2022-10-16 00:32:07 +0000 ipfilter: Removed unused ioctl typedef Defunct operating systems no longer pollute the ipfilter sources. Remove their typedefs. (cherry picked from commit 1fcc50004cebbe3a578f6761936e5d8cd8ee24cd) --- sbin/ipf/common/ipf.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sbin/ipf/common/ipf.h b/sbin/ipf/common/ipf.h index 977b3f0fd105..db4ba91319ad 100644 --- a/sbin/ipf/common/ipf.h +++ b/sbin/ipf/common/ipf.h @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -173,13 +174,7 @@ typedef struct proxyrule { } proxyrule_t; -#if defined(__NetBSD__) || defined(__FreeBSD__) || \ - SOLARIS -# include typedef int (* ioctlfunc_t)(int, ioctlcmd_t, ...); -#else -typedef int (* ioctlfunc_t)(dev_t, ioctlcmd_t, void *); -#endif typedef int (* addfunc_t)(int, ioctlfunc_t, void *); typedef int (* copyfunc_t)(void *, void *, size_t);