diff options
Diffstat (limited to 'plugins/wimax')
41 files changed, 15 insertions, 53 deletions
diff --git a/plugins/wimax/mac_hd_generic_decoder.c b/plugins/wimax/mac_hd_generic_decoder.c index 0b779b82ac..7d72b6c22d 100644 --- a/plugins/wimax/mac_hd_generic_decoder.c +++ b/plugins/wimax/mac_hd_generic_decoder.c @@ -38,7 +38,7 @@ */ #include <string.h> -#include <glib.h> + #include <epan/packet.h> #include <epan/expert.h> #include <epan/address.h> diff --git a/plugins/wimax/mac_hd_type1_decoder.c b/plugins/wimax/mac_hd_type1_decoder.c index 3613dd357c..ac55000959 100644 --- a/plugins/wimax/mac_hd_type1_decoder.c +++ b/plugins/wimax/mac_hd_type1_decoder.c @@ -37,7 +37,6 @@ #define DEBUG */ -#include <glib.h> #include <epan/packet.h> extern gint proto_mac_header_generic_decoder; diff --git a/plugins/wimax/mac_hd_type2_decoder.c b/plugins/wimax/mac_hd_type2_decoder.c index 4d8fe93a41..83ce7752f3 100644 --- a/plugins/wimax/mac_hd_type2_decoder.c +++ b/plugins/wimax/mac_hd_type2_decoder.c @@ -37,7 +37,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> extern gint proto_mac_header_generic_decoder; diff --git a/plugins/wimax/mac_mgmt_msg_decoder.c b/plugins/wimax/mac_mgmt_msg_decoder.c index c093927cc5..12ebf8b7fd 100644 --- a/plugins/wimax/mac_mgmt_msg_decoder.c +++ b/plugins/wimax/mac_mgmt_msg_decoder.c @@ -28,7 +28,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> #include "wimax_mac.h" diff --git a/plugins/wimax/msg_aas_beam.c b/plugins/wimax/msg_aas_beam.c index 2dd68c71d9..d296e11542 100644 --- a/plugins/wimax/msg_aas_beam.c +++ b/plugins/wimax/msg_aas_beam.c @@ -30,7 +30,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "wimax_mac.h" diff --git a/plugins/wimax/msg_aas_fbck.c b/plugins/wimax/msg_aas_fbck.c index 01ca475a1e..3810950f80 100644 --- a/plugins/wimax/msg_aas_fbck.c +++ b/plugins/wimax/msg_aas_fbck.c @@ -28,7 +28,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "wimax_mac.h" diff --git a/plugins/wimax/msg_arq.c b/plugins/wimax/msg_arq.c index 50d6a86dc6..41f743b3f4 100644 --- a/plugins/wimax/msg_arq.c +++ b/plugins/wimax/msg_arq.c @@ -30,7 +30,6 @@ #include "moduleinfo.h" -#include <glib.h> #include <epan/packet.h> #include "crc.h" #include "wimax_tlv.h" diff --git a/plugins/wimax/msg_clk_cmp.c b/plugins/wimax/msg_clk_cmp.c index 459654cdfd..2a586362b0 100644 --- a/plugins/wimax/msg_clk_cmp.c +++ b/plugins/wimax/msg_clk_cmp.c @@ -28,7 +28,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "wimax_mac.h" diff --git a/plugins/wimax/msg_dcd.c b/plugins/wimax/msg_dcd.c index 31af9959a9..443c9d7a6e 100644 --- a/plugins/wimax/msg_dcd.c +++ b/plugins/wimax/msg_dcd.c @@ -32,7 +32,6 @@ #define DEBUG */ -#include <glib.h> #include <epan/packet.h> #include "wimax_tlv.h" #include "wimax_mac.h" diff --git a/plugins/wimax/msg_dlmap.c b/plugins/wimax/msg_dlmap.c index 1610e262b3..d7d92476d3 100644 --- a/plugins/wimax/msg_dlmap.c +++ b/plugins/wimax/msg_dlmap.c @@ -28,7 +28,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "wimax_mac.h" #include "crc.h" diff --git a/plugins/wimax/msg_dreg.c b/plugins/wimax/msg_dreg.c index d4b2f265bf..295804eaab 100644 --- a/plugins/wimax/msg_dreg.c +++ b/plugins/wimax/msg_dreg.c @@ -30,7 +30,6 @@ #include "moduleinfo.h" -#include <glib.h> #include <epan/packet.h> #include "crc.h" #include "wimax_tlv.h" diff --git a/plugins/wimax/msg_dsa.c b/plugins/wimax/msg_dsa.c index 4f7dc54272..05e7c6848e 100644 --- a/plugins/wimax/msg_dsa.c +++ b/plugins/wimax/msg_dsa.c @@ -32,7 +32,6 @@ #define DEBUG */ -#include <glib.h> #include <epan/packet.h> #include "wimax_tlv.h" #include "wimax_mac.h" diff --git a/plugins/wimax/msg_dsc.c b/plugins/wimax/msg_dsc.c index 6551a19c42..4d7fb1b49c 100644 --- a/plugins/wimax/msg_dsc.c +++ b/plugins/wimax/msg_dsc.c @@ -32,7 +32,6 @@ #define DEBUG */ -#include <glib.h> #include <epan/packet.h> #include "wimax_tlv.h" #include "wimax_mac.h" diff --git a/plugins/wimax/msg_dsd.c b/plugins/wimax/msg_dsd.c index 45cb220507..b01f45c75f 100644 --- a/plugins/wimax/msg_dsd.c +++ b/plugins/wimax/msg_dsd.c @@ -32,7 +32,6 @@ #define DEBUG */ -#include <glib.h> #include <epan/packet.h> #include "wimax_tlv.h" #include "wimax_mac.h" diff --git a/plugins/wimax/msg_dsx_rvd.c b/plugins/wimax/msg_dsx_rvd.c index 7f6ac7baaf..eb65f03711 100644 --- a/plugins/wimax/msg_dsx_rvd.c +++ b/plugins/wimax/msg_dsx_rvd.c @@ -28,7 +28,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "wimax_mac.h" diff --git a/plugins/wimax/msg_fpc.c b/plugins/wimax/msg_fpc.c index a47c15edb6..78564c3b58 100644 --- a/plugins/wimax/msg_fpc.c +++ b/plugins/wimax/msg_fpc.c @@ -28,7 +28,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "crc.h" #include "wimax_tlv.h" diff --git a/plugins/wimax/msg_pkm.c b/plugins/wimax/msg_pkm.c index 140fee2b01..ec47db4724 100644 --- a/plugins/wimax/msg_pkm.c +++ b/plugins/wimax/msg_pkm.c @@ -24,15 +24,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* -#define DEBUG // for debug only -*/ +#if 0 +#define DEBUG /* for debug only */ +#endif /* Include files */ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "wimax_tlv.h" #include "wimax_mac.h" diff --git a/plugins/wimax/msg_pmc.c b/plugins/wimax/msg_pmc.c index afb5a29378..01906dffcd 100644 --- a/plugins/wimax/msg_pmc.c +++ b/plugins/wimax/msg_pmc.c @@ -30,7 +30,6 @@ #include "moduleinfo.h" -#include <glib.h> #include <epan/packet.h> #include "crc.h" #include "wimax_tlv.h" diff --git a/plugins/wimax/msg_prc_lt_ctrl.c b/plugins/wimax/msg_prc_lt_ctrl.c index 824f4afc4d..c786e00a57 100644 --- a/plugins/wimax/msg_prc_lt_ctrl.c +++ b/plugins/wimax/msg_prc_lt_ctrl.c @@ -28,7 +28,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "crc.h" #include "wimax_tlv.h" diff --git a/plugins/wimax/msg_reg_req.c b/plugins/wimax/msg_reg_req.c index 0b1c949ac1..e5160e8516 100644 --- a/plugins/wimax/msg_reg_req.c +++ b/plugins/wimax/msg_reg_req.c @@ -30,7 +30,6 @@ #define WIMAX_16E_2005 -#include <glib.h> #include <epan/packet.h> #include "crc.h" #include "wimax_tlv.h" diff --git a/plugins/wimax/msg_reg_rsp.c b/plugins/wimax/msg_reg_rsp.c index e2ac0667a2..ff758f30cd 100644 --- a/plugins/wimax/msg_reg_rsp.c +++ b/plugins/wimax/msg_reg_rsp.c @@ -32,7 +32,6 @@ #define FRAG_LAST 0x1 -#include <glib.h> #include <epan/packet.h> #include "wimax_tlv.h" #include "wimax_mac.h" diff --git a/plugins/wimax/msg_rep.c b/plugins/wimax/msg_rep.c index 98f3b6b58b..fa9dc54d4e 100644 --- a/plugins/wimax/msg_rep.c +++ b/plugins/wimax/msg_rep.c @@ -24,14 +24,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* -#define DEBUG*/ /* for debug only*/ +#if 0 +#define DEBUG /* for debug only*/ +#endif /* Include files */ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "wimax_tlv.h" #include "wimax_mac.h" diff --git a/plugins/wimax/msg_res_cmd.c b/plugins/wimax/msg_res_cmd.c index 653ee96100..2b3a329e53 100644 --- a/plugins/wimax/msg_res_cmd.c +++ b/plugins/wimax/msg_res_cmd.c @@ -24,15 +24,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* -#define DEBUG // for debug only -*/ +#if 0 +#define DEBUG /* for debug only */ +#endif /* Include files */ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "wimax_tlv.h" #include "wimax_mac.h" diff --git a/plugins/wimax/msg_rng_req.c b/plugins/wimax/msg_rng_req.c index e16b51295c..ca9d7bbc56 100644 --- a/plugins/wimax/msg_rng_req.c +++ b/plugins/wimax/msg_rng_req.c @@ -28,7 +28,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "crc.h" #include "wimax_tlv.h" diff --git a/plugins/wimax/msg_rng_rsp.c b/plugins/wimax/msg_rng_rsp.c index a04c3e205e..aabc3d15f7 100644 --- a/plugins/wimax/msg_rng_rsp.c +++ b/plugins/wimax/msg_rng_rsp.c @@ -28,7 +28,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "crc.h" #include "wimax_tlv.h" diff --git a/plugins/wimax/msg_sbc.c b/plugins/wimax/msg_sbc.c index b26f89793f..cd61a0d9bf 100644 --- a/plugins/wimax/msg_sbc.c +++ b/plugins/wimax/msg_sbc.c @@ -24,15 +24,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* -#define DEBUG // for debug only -*/ +#if 0 +#define DEBUG /* for debug only */ +#endif /* Include files */ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "wimax_tlv.h" #include "wimax_mac.h" diff --git a/plugins/wimax/msg_ucd.c b/plugins/wimax/msg_ucd.c index 1d4d7ccfa8..391307bb35 100644 --- a/plugins/wimax/msg_ucd.c +++ b/plugins/wimax/msg_ucd.c @@ -32,7 +32,6 @@ #define DEBUG */ -#include <glib.h> #include <epan/packet.h> #include "wimax_tlv.h" #include "wimax_mac.h" diff --git a/plugins/wimax/msg_ulmap.c b/plugins/wimax/msg_ulmap.c index e82d014901..289f903740 100644 --- a/plugins/wimax/msg_ulmap.c +++ b/plugins/wimax/msg_ulmap.c @@ -28,7 +28,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "crc.h" #include "wimax_mac.h" diff --git a/plugins/wimax/packet-wmx.c b/plugins/wimax/packet-wmx.c index 7d71bb44e0..b0010405aa 100644 --- a/plugins/wimax/packet-wmx.c +++ b/plugins/wimax/packet-wmx.c @@ -29,11 +29,10 @@ #include "config.h" #include <string.h> -#include <glib.h> + #include <epan/packet.h> #include <epan/prefs.h> #include <epan/address.h> -#include <epan/wmem/wmem.h> #include "wimax_tlv.h" void proto_register_wimax(void); diff --git a/plugins/wimax/wimax_cdma_code_decoder.c b/plugins/wimax/wimax_cdma_code_decoder.c index f99dddb88f..76b2b8e9ad 100644 --- a/plugins/wimax/wimax_cdma_code_decoder.c +++ b/plugins/wimax/wimax_cdma_code_decoder.c @@ -28,7 +28,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> void proto_register_wimax_cdma(void); diff --git a/plugins/wimax/wimax_compact_dlmap_ie_decoder.c b/plugins/wimax/wimax_compact_dlmap_ie_decoder.c index c248fd58f4..1426665104 100644 --- a/plugins/wimax/wimax_compact_dlmap_ie_decoder.c +++ b/plugins/wimax/wimax_compact_dlmap_ie_decoder.c @@ -28,7 +28,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "crc.h" #include "wimax_tlv.h" diff --git a/plugins/wimax/wimax_compact_ulmap_ie_decoder.c b/plugins/wimax/wimax_compact_ulmap_ie_decoder.c index bef32f457a..e89da6b133 100644 --- a/plugins/wimax/wimax_compact_ulmap_ie_decoder.c +++ b/plugins/wimax/wimax_compact_ulmap_ie_decoder.c @@ -28,7 +28,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "crc.h" #include "wimax_compact_ulmap_ie_decoder.h" diff --git a/plugins/wimax/wimax_fch_decoder.c b/plugins/wimax/wimax_fch_decoder.c index 0617272964..afa3d19a28 100644 --- a/plugins/wimax/wimax_fch_decoder.c +++ b/plugins/wimax/wimax_fch_decoder.c @@ -29,7 +29,7 @@ #include "config.h" #include <string.h> -#include <glib.h> + #include <epan/packet.h> extern gint proto_wimax; diff --git a/plugins/wimax/wimax_ffb_decoder.c b/plugins/wimax/wimax_ffb_decoder.c index da5c328d04..d6ecc363b6 100644 --- a/plugins/wimax/wimax_ffb_decoder.c +++ b/plugins/wimax/wimax_ffb_decoder.c @@ -28,7 +28,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> extern gint proto_wimax; diff --git a/plugins/wimax/wimax_hack_decoder.c b/plugins/wimax/wimax_hack_decoder.c index 11723ebcee..c90dde3f2c 100644 --- a/plugins/wimax/wimax_hack_decoder.c +++ b/plugins/wimax/wimax_hack_decoder.c @@ -28,7 +28,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> extern gint proto_wimax; diff --git a/plugins/wimax/wimax_harq_map_decoder.c b/plugins/wimax/wimax_harq_map_decoder.c index e28b243fee..a745d1424b 100644 --- a/plugins/wimax/wimax_harq_map_decoder.c +++ b/plugins/wimax/wimax_harq_map_decoder.c @@ -28,7 +28,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "crc.h" #include "wimax_compact_dlmap_ie_decoder.h" diff --git a/plugins/wimax/wimax_pdu_decoder.c b/plugins/wimax/wimax_pdu_decoder.c index 15b1349e87..161bec7003 100644 --- a/plugins/wimax/wimax_pdu_decoder.c +++ b/plugins/wimax/wimax_pdu_decoder.c @@ -28,7 +28,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "crc.h" diff --git a/plugins/wimax/wimax_phy_attributes_decoder.c b/plugins/wimax/wimax_phy_attributes_decoder.c index 7c0f7afe03..d46aee9e28 100644 --- a/plugins/wimax/wimax_phy_attributes_decoder.c +++ b/plugins/wimax/wimax_phy_attributes_decoder.c @@ -28,7 +28,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> extern gint proto_wimax; diff --git a/plugins/wimax/wimax_tlv.h b/plugins/wimax/wimax_tlv.h index 204daddc9d..28bc249327 100644 --- a/plugins/wimax/wimax_tlv.h +++ b/plugins/wimax/wimax_tlv.h @@ -26,7 +26,6 @@ #ifndef _WIMAX_TLV_H_ #define _WIMAX_TLV_H_ -#include <glib.h> #include <epan/packet.h> #define WIMAX_TLV_EXTENDED_LENGTH_MASK 0x80 diff --git a/plugins/wimax/wimax_utils.c b/plugins/wimax/wimax_utils.c index d02fb18e14..7aa972087e 100644 --- a/plugins/wimax/wimax_utils.c +++ b/plugins/wimax/wimax_utils.c @@ -30,7 +30,6 @@ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include "wimax_tlv.h" #include "wimax_mac.h" diff --git a/plugins/wimax/wimax_utils.h b/plugins/wimax/wimax_utils.h index 67902e8798..10528cf01c 100644 --- a/plugins/wimax/wimax_utils.h +++ b/plugins/wimax/wimax_utils.h @@ -26,7 +26,6 @@ #ifndef WIMAX_UTILS_H #define WIMAX_UTILS_H -#include <glib.h> #include <epan/packet.h> extern guint get_service_type(void); |