From fe9013a19c9962fd1383ae2a4f595d0aaa8548da Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Mon, 24 Feb 2014 18:07:33 +0100 Subject: dissectors: Get rid of unecessary includes of protos.h This header is actually only needed in dissector_eth and dissector_80211, so remove the other users accordingly. Signed-off-by: Tobias Klauser --- dissector.c | 1 - dissector_80211.c | 1 - dissector_80211.h | 3 --- dissector_eth.c | 2 +- dissector_eth.h | 3 --- proto_80211_mac_hdr.c | 1 - proto_arp.c | 1 - proto_ethernet.c | 1 - proto_icmpv4.c | 1 - proto_icmpv6.c | 1 - proto_igmp.c | 1 - proto_ip_authentication_hdr.c | 1 - proto_ip_esp.c | 1 - proto_ipv4.c | 1 - proto_ipv6.c | 1 - proto_ipv6_dest_opts.c | 1 - proto_ipv6_fragm.c | 1 - proto_ipv6_hop_by_hop.c | 1 - proto_ipv6_in_ipv4.c | 1 - proto_ipv6_mobility_hdr.c | 1 - proto_ipv6_no_nxt_hdr.c | 1 - proto_ipv6_routing.c | 1 - proto_lldp.c | 1 - proto_mpls_unicast.c | 1 - proto_none.c | 1 - proto_tcp.c | 1 - proto_udp.c | 1 - proto_vlan.c | 1 - proto_vlan_q_in_q.c | 1 - 29 files changed, 1 insertion(+), 33 deletions(-) diff --git a/dissector.c b/dissector.c index 549ce1e..ed6c4de 100644 --- a/dissector.c +++ b/dissector.c @@ -12,7 +12,6 @@ #include "tprintf.h" #include "pkt_buff.h" #include "proto.h" -#include "protos.h" #include "dissector.h" #include "dissector_eth.h" #include "dissector_80211.h" diff --git a/dissector_80211.c b/dissector_80211.c index 472a44d..e638e1e 100644 --- a/dissector_80211.c +++ b/dissector_80211.c @@ -8,7 +8,6 @@ #include "hash.h" #include "protos.h" -#include "pkt_buff.h" #include "dissector.h" #include "dissector_80211.h" #include "xmalloc.h" diff --git a/dissector_80211.h b/dissector_80211.h index 31e1965..47b50a2 100644 --- a/dissector_80211.h +++ b/dissector_80211.h @@ -8,10 +8,7 @@ #define DISSECTOR_80211_H #include "hash.h" -#include "proto.h" #include "protos.h" -#include "tprintf.h" -#include "oui.h" extern struct hash_table ieee80211_lay2; diff --git a/dissector_eth.c b/dissector_eth.c index b87c957..3beff72 100644 --- a/dissector_eth.c +++ b/dissector_eth.c @@ -9,8 +9,8 @@ #include "hash.h" #include "oui.h" #include "str.h" +#include "proto.h" #include "protos.h" -#include "pkt_buff.h" #include "dissector.h" #include "dissector_eth.h" #include "xmalloc.h" diff --git a/dissector_eth.h b/dissector_eth.h index 45d3b6c..c02213f 100644 --- a/dissector_eth.h +++ b/dissector_eth.h @@ -8,10 +8,7 @@ #define DISSECTOR_ETH_H #include "hash.h" -#include "proto.h" #include "protos.h" -#include "tprintf.h" -#include "oui.h" extern struct hash_table eth_lay2; extern struct hash_table eth_lay3; diff --git a/proto_80211_mac_hdr.c b/proto_80211_mac_hdr.c index 59cb320..23f9c7a 100644 --- a/proto_80211_mac_hdr.c +++ b/proto_80211_mac_hdr.c @@ -17,7 +17,6 @@ #include /* for inet_ntop() */ #include "proto.h" -#include "protos.h" #include "dissector_80211.h" #include "built_in.h" #include "pkt_buff.h" diff --git a/proto_arp.c b/proto_arp.c index d6c0eec..bf585d1 100644 --- a/proto_arp.c +++ b/proto_arp.c @@ -8,7 +8,6 @@ #include /* for ntohs() */ #include "proto.h" -#include "protos.h" #include "dissector_eth.h" #include "pkt_buff.h" #include "built_in.h" diff --git a/proto_ethernet.c b/proto_ethernet.c index 99c9d6c..1d5d684 100644 --- a/proto_ethernet.c +++ b/proto_ethernet.c @@ -10,7 +10,6 @@ #include #include "proto.h" -#include "protos.h" #include "dissector_eth.h" #include "pkt_buff.h" #include "oui.h" diff --git a/proto_icmpv4.c b/proto_icmpv4.c index 13f0eda..69ec50c 100644 --- a/proto_icmpv4.c +++ b/proto_icmpv4.c @@ -9,7 +9,6 @@ #include /* for ntohs() */ #include "proto.h" -#include "protos.h" #include "csum.h" #include "dissector_eth.h" #include "pkt_buff.h" diff --git a/proto_icmpv6.c b/proto_icmpv6.c index ada5fdd..e08ab1c 100644 --- a/proto_icmpv6.c +++ b/proto_icmpv6.c @@ -17,7 +17,6 @@ #include #include "proto.h" -#include "protos.h" #include "dissector_eth.h" #include "pkt_buff.h" #include "built_in.h" diff --git a/proto_igmp.c b/proto_igmp.c index f071f6c..b31f5a8 100644 --- a/proto_igmp.c +++ b/proto_igmp.c @@ -9,7 +9,6 @@ #include #include "proto.h" -#include "protos.h" #include "csum.h" #include "dissector_eth.h" #include "built_in.h" diff --git a/proto_ip_authentication_hdr.c b/proto_ip_authentication_hdr.c index 2e01163..d8b352f 100644 --- a/proto_ip_authentication_hdr.c +++ b/proto_ip_authentication_hdr.c @@ -11,7 +11,6 @@ #include /* for ntohs() */ #include "proto.h" -#include "protos.h" #include "dissector_eth.h" #include "built_in.h" #include "pkt_buff.h" diff --git a/proto_ip_esp.c b/proto_ip_esp.c index cc4e06e..8dabdb3 100644 --- a/proto_ip_esp.c +++ b/proto_ip_esp.c @@ -11,7 +11,6 @@ #include /* for ntohs() */ #include "proto.h" -#include "protos.h" #include "dissector_eth.h" #include "built_in.h" #include "pkt_buff.h" diff --git a/proto_ipv4.c b/proto_ipv4.c index 303319e..2eb5e4f 100644 --- a/proto_ipv4.c +++ b/proto_ipv4.c @@ -11,7 +11,6 @@ #include /* for inet_ntop() */ #include "proto.h" -#include "protos.h" #include "csum.h" #include "dissector_eth.h" #include "ipv4.h" diff --git a/proto_ipv6.c b/proto_ipv6.c index 23cf6c4..a38bec3 100644 --- a/proto_ipv6.c +++ b/proto_ipv6.c @@ -11,7 +11,6 @@ #include /* for inet_ntop() */ #include "proto.h" -#include "protos.h" #include "csum.h" #include "dissector_eth.h" #include "ipv6.h" diff --git a/proto_ipv6_dest_opts.c b/proto_ipv6_dest_opts.c index 696b6e2..04d02fa 100644 --- a/proto_ipv6_dest_opts.c +++ b/proto_ipv6_dest_opts.c @@ -11,7 +11,6 @@ #include /* for ntohs() */ #include "proto.h" -#include "protos.h" #include "dissector_eth.h" #include "built_in.h" #include "pkt_buff.h" diff --git a/proto_ipv6_fragm.c b/proto_ipv6_fragm.c index 568a897..4e4af50 100644 --- a/proto_ipv6_fragm.c +++ b/proto_ipv6_fragm.c @@ -11,7 +11,6 @@ #include /* for ntohs() */ #include "proto.h" -#include "protos.h" #include "dissector_eth.h" #include "built_in.h" #include "pkt_buff.h" diff --git a/proto_ipv6_hop_by_hop.c b/proto_ipv6_hop_by_hop.c index 26f338a..a03bbfa 100644 --- a/proto_ipv6_hop_by_hop.c +++ b/proto_ipv6_hop_by_hop.c @@ -11,7 +11,6 @@ #include /* for ntohs() */ #include "proto.h" -#include "protos.h" #include "dissector_eth.h" #include "built_in.h" #include "pkt_buff.h" diff --git a/proto_ipv6_in_ipv4.c b/proto_ipv6_in_ipv4.c index 69eaadc..1f285f3 100644 --- a/proto_ipv6_in_ipv4.c +++ b/proto_ipv6_in_ipv4.c @@ -11,7 +11,6 @@ #include /* for ntohs() */ #include "proto.h" -#include "protos.h" #include "dissector_eth.h" #include "built_in.h" diff --git a/proto_ipv6_mobility_hdr.c b/proto_ipv6_mobility_hdr.c index 33994e1..5ae5c7c 100644 --- a/proto_ipv6_mobility_hdr.c +++ b/proto_ipv6_mobility_hdr.c @@ -12,7 +12,6 @@ #include #include "proto.h" -#include "protos.h" #include "dissector_eth.h" #include "built_in.h" #include "pkt_buff.h" diff --git a/proto_ipv6_no_nxt_hdr.c b/proto_ipv6_no_nxt_hdr.c index c1ef3d0..d2cf072 100644 --- a/proto_ipv6_no_nxt_hdr.c +++ b/proto_ipv6_no_nxt_hdr.c @@ -11,7 +11,6 @@ #include /* for ntohs() */ #include "proto.h" -#include "protos.h" #include "dissector_eth.h" #include "built_in.h" diff --git a/proto_ipv6_routing.c b/proto_ipv6_routing.c index 735f976..39db807 100644 --- a/proto_ipv6_routing.c +++ b/proto_ipv6_routing.c @@ -12,7 +12,6 @@ #include /* for inet_ntop() */ #include "proto.h" -#include "protos.h" #include "dissector_eth.h" #include "built_in.h" #include "pkt_buff.h" diff --git a/proto_lldp.c b/proto_lldp.c index 9301281..b3d2f86 100644 --- a/proto_lldp.c +++ b/proto_lldp.c @@ -12,7 +12,6 @@ #include "oui.h" #include "pkt_buff.h" #include "proto.h" -#include "protos.h" #define EXTRACT_16BIT(x) ntohs(*((uint16_t *) (x))) #define EXTRACT_32BIT(x) ntohl(*((uint32_t *) (x))) diff --git a/proto_mpls_unicast.c b/proto_mpls_unicast.c index 113c10f..e01672a 100644 --- a/proto_mpls_unicast.c +++ b/proto_mpls_unicast.c @@ -12,7 +12,6 @@ #include #include "proto.h" -#include "protos.h" #include "dissector_eth.h" #include "built_in.h" #include "pkt_buff.h" diff --git a/proto_none.c b/proto_none.c index 0c0f62a..41835a0 100644 --- a/proto_none.c +++ b/proto_none.c @@ -9,7 +9,6 @@ #include #include "proto.h" -#include "protos.h" #include "pkt_buff.h" void empty(struct pkt_buff *pkt __maybe_unused) {} diff --git a/proto_tcp.c b/proto_tcp.c index 67e99b5..f0e28f8 100644 --- a/proto_tcp.c +++ b/proto_tcp.c @@ -11,7 +11,6 @@ #include #include "proto.h" -#include "protos.h" #include "dissector_eth.h" #include "built_in.h" #include "pkt_buff.h" diff --git a/proto_udp.c b/proto_udp.c index 91c9a17..f9f052c 100644 --- a/proto_udp.c +++ b/proto_udp.c @@ -9,7 +9,6 @@ #include /* for ntohs() */ #include "proto.h" -#include "protos.h" #include "dissector_eth.h" #include "pkt_buff.h" diff --git a/proto_vlan.c b/proto_vlan.c index baa36b8..f9b2cf2 100644 --- a/proto_vlan.c +++ b/proto_vlan.c @@ -10,7 +10,6 @@ #include /* for ntohs() */ #include "proto.h" -#include "protos.h" #include "dissector_eth.h" #include "pkt_buff.h" diff --git a/proto_vlan_q_in_q.c b/proto_vlan_q_in_q.c index 72e7b78..20b4bc1 100644 --- a/proto_vlan_q_in_q.c +++ b/proto_vlan_q_in_q.c @@ -11,7 +11,6 @@ #include /* for ntohs() */ #include "proto.h" -#include "protos.h" #include "dissector_eth.h" #include "built_in.h" #include "pkt_buff.h" -- cgit v1.2.3-54-g00ecf