From nobody Fri May 23 07:50:28 2025 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 4b3clT2HFTz5wvHG; Fri, 23 May 2025 07:50:29 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b3clT0Nbxz42V1; Fri, 23 May 2025 07:50:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747986629; 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=ELVMgj9yCh/75bNsoJDxkjIkp5oTENsNcfIfFLrSBOk=; b=ixuJrSF1Z0CzaT0dpwbpCSOrftWEJWwYIz+CEovYifbbucqcRd3ZmuMe130jbTDIizar1U fsZyxX0nxj5+BCpg8PrzXNoDu3FX8PHfPxY/LVqr4uh62hnVBcuhuHi/5I+WPm+bUqG9N3 pNymqJVQSUoRBqZqdXwQhpW7ign2TMb09Gg5Z41wtwWVMHNK+WFPIYW7rCn+1RI04M2i2H d+TgOCHHW7NYiVpkYbYAcVO0UHHvegjPFlkKh/hf2ZG+yHCBwYw40CdBTUf4M/ry0VHzAn lm9y3Yl51pZTVXPiUtSpYlSCoSOxzXLo/xZy1nBwynOJONKTkkstP0eaQLy4AQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747986629; 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=ELVMgj9yCh/75bNsoJDxkjIkp5oTENsNcfIfFLrSBOk=; b=B9hHjaENLUBXPzUX8g2S66KO/eL78I+2eFSOKA+AWhxpfaDHEcItI41YYN6TxMrKbMhdHW W24RuP0+M8xWk2rsYl3Xj+Bbex1A+0C95s6hWmS7v3x07lbVSeq3yLY4qduE0KhMYhnbZx oyr0+VlhenluR0K66FzD2M7G1tRpnsGTOBfjcxWHCRnYqEklnu4m9MOHArW7M/ZPwh6htp rixvKV+Zgd8XR0X4EtorDLGXU/vkruG+3uM8C75OYuFiNKJHhnvSKhSQh6WWJsc3QrDwrc fe2Hm4/73MWO9FG3H7VrE73kl9tyG56Uu9U/MSprXrwkCAhaGECqrWy9Pmwalw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747986629; a=rsa-sha256; cv=none; b=ALq+NaExNcxK0QXoty89rJPENxNwU/AEyPjSkIq+6Rhe3jWp4Xmd14x2IKvk/J09LX0Dx3 ZVqCacLX3giYk8MMwoAusXLxdDUC/MRN6vvRD6gXv7szVm/IMU0UNYlQVKSFxQcBTAt+W4 RNrOyGhRuzwRR6b1RKw8WoXm8b2tOVEqrubtSTQGCA3dO5TB+Lnj6dtOiP+4YaRxk658OB a8KGU+PO8gadWKWweUsYtHgtq3qGPIa/4sGqy6W1970AGKZsjfuWusJKuaAx9kfZaPkUkq NPkmAvUtlWBSLghLkx3rerFQbA5xWsVVkP8XS6alhm5h/Ue0LICcquRW5bzkkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4b3clS75ZhzxXR; Fri, 23 May 2025 07:50:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54N7oSmn055612; Fri, 23 May 2025 07:50:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54N7oS5J055609; Fri, 23 May 2025 07:50:28 GMT (envelope-from git) Date: Fri, 23 May 2025 07:50:28 GMT Message-Id: <202505230750.54N7oS5J055609@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: fb1749cc6468 - main - wtap(4): Clean up includes 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb1749cc6468220a69a8fdc7a2d0aac51ada598a Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=fb1749cc6468220a69a8fdc7a2d0aac51ada598a commit fb1749cc6468220a69a8fdc7a2d0aac51ada598a Author: Li-Wen Hsu AuthorDate: 2025-05-23 07:48:12 +0000 Commit: Li-Wen Hsu CommitDate: 2025-05-23 07:49:50 +0000 wtap(4): Clean up includes Sponsored by: The FreeBSD Foundation --- sys/dev/wtap/if_wtap.c | 3 --- sys/dev/wtap/if_wtap_module.c | 35 +---------------------------- sys/dev/wtap/if_wtapioctl.h | 2 +- sys/dev/wtap/if_wtapvar.h | 28 ----------------------- sys/dev/wtap/plugins/visibility.c | 40 +-------------------------------- sys/dev/wtap/plugins/visibility_ioctl.h | 2 -- 6 files changed, 3 insertions(+), 107 deletions(-) diff --git a/sys/dev/wtap/if_wtap.c b/sys/dev/wtap/if_wtap.c index 2b098bcc3dda..dd332c538c8f 100644 --- a/sys/dev/wtap/if_wtap.c +++ b/sys/dev/wtap/if_wtap.c @@ -33,11 +33,8 @@ */ #include "if_wtapvar.h" #include /* uio struct */ -#include #include -#include -#include #include "if_medium.h" #include "wtap_hal/hal.h" diff --git a/sys/dev/wtap/if_wtap_module.c b/sys/dev/wtap/if_wtap_module.c index 52a371fd4b8f..6b5f8502bd08 100644 --- a/sys/dev/wtap/if_wtap_module.c +++ b/sys/dev/wtap/if_wtap_module.c @@ -28,52 +28,19 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. */ + #include #include -#include -#include -#include -#include #include -#include -#include -#include -#include #include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include - -#include #include -#include #include -#include -#include #include -#include -#include - -#include -#include - -#include - -#include -#include /* cdevsw struct */ -#include /* uio struct */ #include -#include #include "if_wtapvar.h" #include "if_wtapioctl.h" diff --git a/sys/dev/wtap/if_wtapioctl.h b/sys/dev/wtap/if_wtapioctl.h index 6cde392ab7c1..05f88a5dcb81 100644 --- a/sys/dev/wtap/if_wtapioctl.h +++ b/sys/dev/wtap/if_wtapioctl.h @@ -40,7 +40,7 @@ #ifndef _DEV_WTAP_WTAPIOCTL_H #define _DEV_WTAP_WTAPIOCTL_H -#include +#include #include #define SIOCGATHSTATS _IOWR('i', 137, struct ifreq) diff --git a/sys/dev/wtap/if_wtapvar.h b/sys/dev/wtap/if_wtapvar.h index 4a7336368843..0cc0fd487a1c 100644 --- a/sys/dev/wtap/if_wtapvar.h +++ b/sys/dev/wtap/if_wtapvar.h @@ -34,46 +34,18 @@ #include #include -#include -#include -#include -#include -#include #include -#include -#include #include #include -#include -#include -#include -#include -#include -#include -#include -#include - -#include #include -#include #include -#include -#include #include -#include #include #include -#include - -#include - -#include -#include - #if 0 #define DWTAP_PRINTF(...) printf(__VA_ARGS__) #else diff --git a/sys/dev/wtap/plugins/visibility.c b/sys/dev/wtap/plugins/visibility.c index 2ff695fba5f1..1e6a9057728f 100644 --- a/sys/dev/wtap/plugins/visibility.c +++ b/sys/dev/wtap/plugins/visibility.c @@ -28,52 +28,14 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. */ + #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include - -#include #include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include - -#include -#include /* cdevsw struct */ -#include /* uio struct */ - #include -#include #include "visibility.h" diff --git a/sys/dev/wtap/plugins/visibility_ioctl.h b/sys/dev/wtap/plugins/visibility_ioctl.h index b9c43984b4f5..a5c09e6af22a 100644 --- a/sys/dev/wtap/plugins/visibility_ioctl.h +++ b/sys/dev/wtap/plugins/visibility_ioctl.h @@ -36,8 +36,6 @@ #ifndef _VISIBILITY_IOCTL_H #define _VISIBILITY_IOCTL_H -#include - struct link { int op; //0 remove, 1 link int id1;