From nobody Sun Oct 09 00:28:32 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 4MlNFF2Yz1z4V2mR; Sun, 9 Oct 2022 00:28:33 +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 4MlNFF1w8dz3jxS; Sun, 9 Oct 2022 00:28:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665275313; 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=WwN1FqBystpwUa+V+6k4EGcyzANX7cayYUXXJ/eLEp0=; b=npS1Yuy5FtLSF6FmnSPwf2A/Yp3SOLcyw6Lp767rA7eM1qw2xeQ0mGZwm5EtM+4pVYujJ2 r9UcG3nw2BCjEHZR4K5sBQyiZkmkZ30oH76bossZKEDh96PmlDldX+asUjMCrN8VEyrsKJ /3si+7uD6/dQHWTBqtYiWP6givZE3sVnjD4Gj/UWYV8Kx9afXvZyYl0e/LyhulMiPXYVIw kpIvgUosHM0D707y+xdGCBrExfK2FS3Rz3Qv6MvjtTf1Mal+bdsyG5ZSzB37ofPA9LKNE5 IxE3ihfV8kdmpC8xdo1qjyOHDMPx6OAFIgHbU7RaFGdu2nJRvos/nZEVkFivQw== 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 4MlNFF0kKqz15vP; Sun, 9 Oct 2022 00:28:33 +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 2990SWxN009398; Sun, 9 Oct 2022 00:28:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2990SWBC009397; Sun, 9 Oct 2022 00:28:32 GMT (envelope-from git) Date: Sun, 9 Oct 2022 00:28:32 GMT Message-Id: <202210090028.2990SWBC009397@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 1fcc50004ceb - main - ipfilter: Removed unused ioctl typedef 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1fcc50004cebbe3a578f6761936e5d8cd8ee24cd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665275313; 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=WwN1FqBystpwUa+V+6k4EGcyzANX7cayYUXXJ/eLEp0=; b=MIxErD7gmIsRTi+B6LO5/gj66VU/MXCxMF4ZYxpbdLNgCcyPiF+/ZAY/a3A7n8UB76L9RS OuSzOMok9HlOr7Jc9L1dGU7CllaNQvgG5hrLTb25xwASRiHWEffPy2FgMatPCTqU7Cy/Af 8GUwkQfoMRXGIL+eMgQRrCHC9MEjZkCSVw8EY2mtw+F0nRmNy9bcg0G7nFfJsT/D+4qR7h jb7+4aI0kLjGXFyHmnzvZxTj341WASSn7QXJdCPKmQ11Kx1UnmpkV4zOAepOmHK0QWITqK VXjCQbdZgKdj549FKRAgpwM/mAnkW0UD3+xMWbfx8DT2y1wl5VfxMItAxlGLdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665275313; a=rsa-sha256; cv=none; b=x4JtIjiIzZKBU5xqUPJkVmrYT/XIUr0r9L3D48Ma+iSCe2Ok3eGYSpePATPKnf+PvwCYz0 Q3x93FNK0KvjZGeWd4behs8S9pB6ARCHsjJOHEC+E5nAzI9a5CrJGegYrEGFikZVp1JSF4 NUW2HJG34vAAuM91HaEsObGqoXewu267TxaHyYGZCrrsDEZfzO5wxpFzD17T5eWCoe+O+I kfrwM8S9zFay4V5zfH2uZ7hXJDfpRyz6Jyk/ydVCpgblovRpJaauna/83aGjMAmnLFw4gZ VtFVTOEB3fhk1IHMzt6DkimdorVz10PIJZB8q7+XMYXtlUJxcfnyeb0QWyrXdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=1fcc50004cebbe3a578f6761936e5d8cd8ee24cd commit 1fcc50004cebbe3a578f6761936e5d8cd8ee24cd Author: Cy Schubert AuthorDate: 2022-10-07 10:05:53 +0000 Commit: Cy Schubert CommitDate: 2022-10-09 00:28:04 +0000 ipfilter: Removed unused ioctl typedef Defunct operating systems no longer pollute the ipfilter sources. Remove their typedefs. MFC after: 1 week --- 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);