From nobody Sun Oct 16 00:33:08 2022 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 4Mqh1J5j1Bz4g56y; Sun, 16 Oct 2022 00:33:08 +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 4Mqh1J5DSCz3WDb; Sun, 16 Oct 2022 00:33:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665880388; 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=R3T7oYrDLKzay+m7VOxd64j0dHk2sSmf1OOT6eI3X9I=; b=NQ4zPgOlP2UL3iuOT6USe7qmNGeNOT7e3HPe5hHkx5QhACgrd6gLEo5pom6CZ1IXy/4Qx/ KVM3chzEGj4+6olEs876pGXdIVrJ9V47tLCzu3dJB6Pg4FafKNjWynACJVDwOp9obWZBdK T3lf1j5ICWcpd5bNN+zJxRLcQqypnfzO8l71FT6DIlr5uv1h1AjtKTttKfO68n0p/4bv10 uliTFjM1XygxcUSVOkkLw4mbnb7juxFmuRym3idxWCWzEjt4YsVv/4v8D23SHq8Lp3aNPW uV6Hv+4LV1xuJU221ZElkfVljLRRFV+B76WGP45hOG07p9kwKdqYSynOeBs4Gw== 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 4Mqh1J4LnRzHvQ; Sun, 16 Oct 2022 00:33:08 +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 29G0X8RD085497; Sun, 16 Oct 2022 00:33:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29G0X8sU085496; Sun, 16 Oct 2022 00:33:08 GMT (envelope-from git) Date: Sun, 16 Oct 2022 00:33:08 GMT Message-Id: <202210160033.29G0X8sU085496@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: 2b087796cc7c - stable/13 - ipfilter: Removed unused ioctl typedef 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: 2b087796cc7ce832df520396d4729944c0e1b4ae Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665880388; 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=R3T7oYrDLKzay+m7VOxd64j0dHk2sSmf1OOT6eI3X9I=; b=a6ePyZ1uBfPtdircRGTTeUOz1w1sbvY8LtXus9WwE7ckswk2UrcorkZI5Cv5Ld0ii38enu h89MwfD04EP78dmEHH3eYaIRwaHA97++Zy1Ke+B9ol9BMokRjfwOnJE7AKXZP1Q8hrDjfQ AYVn2UFO+PJcWDg7inpuyoEMgKzjMCyz68LI1XWu8QNeNoOnl0Y9LuLbXw35nHebsvOGMf 6BjBiTDJPaJ1Qu0Xgn2RJVpKmhU7RNkqFiPgZrz38cqyliLgQkVZ6m5QpTlbG88O9rprFT Cf6pMs8N+4FTCl/utr7F67keOnkA2LEgwZE9xsCBKRNVT+8XH175bD6M2Ubkcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665880388; a=rsa-sha256; cv=none; b=yez+Di2PHe8n3t3G0My4rk3PDLgpuLoNm5kdGOz9z1jZdh22FwtWLcNUqdBUfzfEMWmc2B 0JG9ZkN+xyNMWTBh2ttMrLc30n/M7kodVkfWjigkxO9CF//93n/iUIC2lZUdgi6bNDLJRx ruu7V14DUOXeiIkXFCXFVsP+qpEtVUKZOhydEEMnXnhWAAl54Rw2HrzVeXuopmbhnRQ2Cq q2x8VchJLZytLtPebvZD0eKPn/lJyAXon3Cl5XzkPHAY8441VwF44/tcocaHxtJRy24DC4 VggX9YBZeUbgnRwObr6Z8Nt4SQP0uVw/b+4zk1TRKXwr7tGRHkHddIQtrW9BOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=2b087796cc7ce832df520396d4729944c0e1b4ae commit 2b087796cc7ce832df520396d4729944c0e1b4ae Author: Cy Schubert AuthorDate: 2022-10-07 10:05:53 +0000 Commit: Cy Schubert CommitDate: 2022-10-16 00:33:00 +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);