From 50e746a22c3846547dc787f62dc52ab3d335c858 Mon Sep 17 00:00:00 2001 From: wmeier Date: Wed, 28 Jan 2009 20:52:52 +0000 Subject: #include prefs.h not req'd git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27322 f5534014-38df-0310-8fa8-9805f1628bb7 --- asn1/h282/packet-h282-template.c | 1 - asn1/h283/packet-h283-template.c | 1 - asn1/h450-ros/packet-h450-ros-template.c | 1 - asn1/mpeg-audio/packet-mpeg-audio-template.c | 1 - asn1/mpeg-pes/packet-mpeg-pes-template.c | 1 - asn1/q932/packet-q932-template.c | 1 - asn1/qsig/packet-qsig-template.c | 1 - asn1/t125/packet-t125-template.c | 1 - epan/dissectors/packet-h282.c | 11 +++++------ epan/dissectors/packet-h283.c | 11 +++++------ epan/dissectors/packet-h450-ros.c | 11 +++++------ epan/dissectors/packet-mpeg-audio.c | 11 +++++------ epan/dissectors/packet-mpeg-pes.c | 11 +++++------ epan/dissectors/packet-q932.c | 11 +++++------ epan/dissectors/packet-qsig.c | 19 +++++++++---------- epan/dissectors/packet-t125.c | 13 ++++++------- 16 files changed, 45 insertions(+), 61 deletions(-) diff --git a/asn1/h282/packet-h282-template.c b/asn1/h282/packet-h282-template.c index 3b21ecf0ba..e21be6e5f1 100644 --- a/asn1/h282/packet-h282-template.c +++ b/asn1/h282/packet-h282-template.c @@ -29,7 +29,6 @@ #include #include -#include #include #include #include diff --git a/asn1/h283/packet-h283-template.c b/asn1/h283/packet-h283-template.c index b10453b283..2a7fe32ef4 100644 --- a/asn1/h283/packet-h283-template.c +++ b/asn1/h283/packet-h283-template.c @@ -29,7 +29,6 @@ #include #include -#include #include #include #include diff --git a/asn1/h450-ros/packet-h450-ros-template.c b/asn1/h450-ros/packet-h450-ros-template.c index db5e66dee8..7ed5dde7c7 100644 --- a/asn1/h450-ros/packet-h450-ros-template.c +++ b/asn1/h450-ros/packet-h450-ros-template.c @@ -30,7 +30,6 @@ #include #include -#include #include #include #include diff --git a/asn1/mpeg-audio/packet-mpeg-audio-template.c b/asn1/mpeg-audio/packet-mpeg-audio-template.c index c90a29ba32..f93b524861 100644 --- a/asn1/mpeg-audio/packet-mpeg-audio-template.c +++ b/asn1/mpeg-audio/packet-mpeg-audio-template.c @@ -32,7 +32,6 @@ #include #include -#include #include #include diff --git a/asn1/mpeg-pes/packet-mpeg-pes-template.c b/asn1/mpeg-pes/packet-mpeg-pes-template.c index 42374168a4..d9bb6e3c6f 100644 --- a/asn1/mpeg-pes/packet-mpeg-pes-template.c +++ b/asn1/mpeg-pes/packet-mpeg-pes-template.c @@ -32,7 +32,6 @@ #include #include -#include #include #include "packet-per.h" diff --git a/asn1/q932/packet-q932-template.c b/asn1/q932/packet-q932-template.c index 88d469f274..b9dbe55072 100644 --- a/asn1/q932/packet-q932-template.c +++ b/asn1/q932/packet-q932-template.c @@ -28,7 +28,6 @@ #endif #include -#include #include #include #include diff --git a/asn1/qsig/packet-qsig-template.c b/asn1/qsig/packet-qsig-template.c index 0cb0a96937..3e9f984f7f 100644 --- a/asn1/qsig/packet-qsig-template.c +++ b/asn1/qsig/packet-qsig-template.c @@ -28,7 +28,6 @@ #endif #include -#include #include #include #include diff --git a/asn1/t125/packet-t125-template.c b/asn1/t125/packet-t125-template.c index 2a7816a8d8..a87ab9bfe2 100644 --- a/asn1/t125/packet-t125-template.c +++ b/asn1/t125/packet-t125-template.c @@ -35,7 +35,6 @@ #include #include -#include #include #include #include "packet-ber.h" diff --git a/epan/dissectors/packet-h282.c b/epan/dissectors/packet-h282.c index 583c04b0d0..5d54522b20 100644 --- a/epan/dissectors/packet-h282.c +++ b/epan/dissectors/packet-h282.c @@ -37,7 +37,6 @@ #include #include -#include #include #include #include @@ -491,7 +490,7 @@ static int hf_h282_deviceEventNotifyIndication = -1; /* DeviceEventNotifyIndica static int hf_h282_nonStandardIndication = -1; /* NonStandardPDU */ /*--- End of included file: packet-h282-hf.c ---*/ -#line 49 "packet-h282-template.c" +#line 48 "packet-h282-template.c" /* Initialize the subtree pointers */ static int ett_h282 = -1; @@ -643,7 +642,7 @@ static gint ett_h282_ResponsePDU = -1; static gint ett_h282_IndicationPDU = -1; /*--- End of included file: packet-h282-ett.c ---*/ -#line 53 "packet-h282-template.c" +#line 52 "packet-h282-template.c" /* Dissectors */ @@ -4402,7 +4401,7 @@ static int dissect_RDCPDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_t /*--- End of included file: packet-h282-fn.c ---*/ -#line 59 "packet-h282-template.c" +#line 58 "packet-h282-template.c" static int dissect_h282(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) @@ -6161,7 +6160,7 @@ void proto_register_h282(void) { "h282.NonStandardPDU", HFILL }}, /*--- End of included file: packet-h282-hfarr.c ---*/ -#line 81 "packet-h282-template.c" +#line 80 "packet-h282-template.c" }; /* List of subtrees */ @@ -6315,7 +6314,7 @@ void proto_register_h282(void) { &ett_h282_IndicationPDU, /*--- End of included file: packet-h282-ettarr.c ---*/ -#line 87 "packet-h282-template.c" +#line 86 "packet-h282-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-h283.c b/epan/dissectors/packet-h283.c index 7a20653c96..8f35e58351 100644 --- a/epan/dissectors/packet-h283.c +++ b/epan/dissectors/packet-h283.c @@ -37,7 +37,6 @@ #include #include -#include #include #include #include @@ -90,7 +89,7 @@ static int hf_h283_deviceListResp = -1; /* T_deviceListResp */ static int hf_h283_deviceChange = -1; /* NULL */ /*--- End of included file: packet-h283-hf.c ---*/ -#line 49 "packet-h283-template.c" +#line 48 "packet-h283-template.c" /* Initialize the subtree pointers */ static int ett_h283 = -1; @@ -113,7 +112,7 @@ static gint ett_h283_LCTIndication = -1; static gint ett_h283_NonStandardMessage = -1; /*--- End of included file: packet-h283-ett.c ---*/ -#line 53 "packet-h283-template.c" +#line 52 "packet-h283-template.c" /* Subdissectors */ static dissector_handle_t rdc_pdu_handle; @@ -571,7 +570,7 @@ static int dissect_LCTPDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_t /*--- End of included file: packet-h283-fn.c ---*/ -#line 62 "packet-h283-template.c" +#line 61 "packet-h283-template.c" static int dissect_h283_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) @@ -728,7 +727,7 @@ void proto_register_h283(void) { "h283.NULL", HFILL }}, /*--- End of included file: packet-h283-hfarr.c ---*/ -#line 86 "packet-h283-template.c" +#line 85 "packet-h283-template.c" }; /* List of subtrees */ @@ -753,7 +752,7 @@ void proto_register_h283(void) { &ett_h283_NonStandardMessage, /*--- End of included file: packet-h283-ettarr.c ---*/ -#line 92 "packet-h283-template.c" +#line 91 "packet-h283-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-h450-ros.c b/epan/dissectors/packet-h450-ros.c index 4d2a4aaba4..24ed803318 100644 --- a/epan/dissectors/packet-h450-ros.c +++ b/epan/dissectors/packet-h450-ros.c @@ -38,7 +38,6 @@ #include #include -#include #include #include #include @@ -76,7 +75,7 @@ static int hf_h450_ros_returnResultProblem = -1; /* ReturnResultProblem */ static int hf_h450_ros_returnErrorProblem = -1; /* ReturnErrorProblem */ /*--- End of included file: packet-h450-ros-hf.c ---*/ -#line 47 "packet-h450-ros-template.c" +#line 46 "packet-h450-ros-template.c" /* Initialize the subtree pointers */ @@ -92,7 +91,7 @@ static gint ett_h450_ros_Reject = -1; static gint ett_h450_ros_T_problem = -1; /*--- End of included file: packet-h450-ros-ett.c ---*/ -#line 50 "packet-h450-ros-template.c" +#line 49 "packet-h450-ros-template.c" /* Preferences */ @@ -571,7 +570,7 @@ dissect_h450_ros_ROS(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pr /*--- End of included file: packet-h450-ros-fn.c ---*/ -#line 77 "packet-h450-ros-template.c" +#line 76 "packet-h450-ros-template.c" /*--- proto_register_h450_ros -----------------------------------------------*/ void proto_register_h450_ros(void) { @@ -663,7 +662,7 @@ void proto_register_h450_ros(void) { "h450_ros.ReturnErrorProblem", HFILL }}, /*--- End of included file: packet-h450-ros-hfarr.c ---*/ -#line 84 "packet-h450-ros-template.c" +#line 83 "packet-h450-ros-template.c" }; /* List of subtrees */ @@ -681,7 +680,7 @@ void proto_register_h450_ros(void) { &ett_h450_ros_T_problem, /*--- End of included file: packet-h450-ros-ettarr.c ---*/ -#line 89 "packet-h450-ros-template.c" +#line 88 "packet-h450-ros-template.c" }; /* Register protocol and dissector */ diff --git a/epan/dissectors/packet-mpeg-audio.c b/epan/dissectors/packet-mpeg-audio.c index 35ebc1bc57..656736e665 100644 --- a/epan/dissectors/packet-mpeg-audio.c +++ b/epan/dissectors/packet-mpeg-audio.c @@ -40,7 +40,6 @@ #include #include -#include #include #include @@ -74,7 +73,7 @@ static int hf_mpeg_audio_track = -1; /* INTEGER_0_255 */ static int hf_mpeg_audio_genre = -1; /* T_genre */ /*--- End of included file: packet-mpeg-audio-hf.c ---*/ -#line 43 "packet-mpeg-audio-template.c" +#line 42 "packet-mpeg-audio-template.c" /*--- Included file: packet-mpeg-audio-ett.c ---*/ #line 1 "packet-mpeg-audio-ett.c" @@ -82,7 +81,7 @@ static gint ett_mpeg_audio_Audio = -1; static gint ett_mpeg_audio_ID3v1 = -1; /*--- End of included file: packet-mpeg-audio-ett.c ---*/ -#line 44 "packet-mpeg-audio-template.c" +#line 43 "packet-mpeg-audio-template.c" /*--- Included file: packet-mpeg-audio-fn.c ---*/ #line 1 "packet-mpeg-audio-fn.c" @@ -453,7 +452,7 @@ dissect_mpeg_audio_ID3v1(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ /*--- End of included file: packet-mpeg-audio-fn.c ---*/ -#line 45 "packet-mpeg-audio-template.c" +#line 44 "packet-mpeg-audio-template.c" static int proto_mpeg_audio = -1; @@ -672,7 +671,7 @@ proto_register_mpeg_audio(void) "mpeg_audio.T_genre", HFILL }}, /*--- End of included file: packet-mpeg-audio-hfarr.c ---*/ -#line 171 "packet-mpeg-audio-template.c" +#line 170 "packet-mpeg-audio-template.c" { &hf_mpeg_audio, { "MPEG Audio", "mpeg.audio", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -699,7 +698,7 @@ proto_register_mpeg_audio(void) &ett_mpeg_audio_ID3v1, /*--- End of included file: packet-mpeg-audio-ettarr.c ---*/ -#line 191 "packet-mpeg-audio-template.c" +#line 190 "packet-mpeg-audio-template.c" }; proto_mpeg_audio = proto_register_protocol( diff --git a/epan/dissectors/packet-mpeg-pes.c b/epan/dissectors/packet-mpeg-pes.c index 88fde06bec..0916e0a516 100644 --- a/epan/dissectors/packet-mpeg-pes.c +++ b/epan/dissectors/packet-mpeg-pes.c @@ -40,7 +40,6 @@ #include #include -#include #include #include "packet-per.h" @@ -100,7 +99,7 @@ static int hf_mpeg_pes_frame_type = -1; /* T_frame_type */ static int hf_mpeg_pes_vbv_delay = -1; /* BIT_STRING_SIZE_16 */ /*--- End of included file: packet-mpeg-pes-hf.c ---*/ -#line 41 "packet-mpeg-pes-template.c" +#line 40 "packet-mpeg-pes-template.c" /*--- Included file: packet-mpeg-pes-ett.c ---*/ #line 1 "packet-mpeg-pes-ett.c" @@ -112,7 +111,7 @@ static gint ett_mpeg_pes_Group_of_pictures = -1; static gint ett_mpeg_pes_Picture = -1; /*--- End of included file: packet-mpeg-pes-ett.c ---*/ -#line 42 "packet-mpeg-pes-template.c" +#line 41 "packet-mpeg-pes-template.c" /*--- Included file: packet-mpeg-pes-fn.c ---*/ #line 1 "packet-mpeg-pes-fn.c" @@ -480,7 +479,7 @@ dissect_mpeg_pes_Picture(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ /*--- End of included file: packet-mpeg-pes-fn.c ---*/ -#line 43 "packet-mpeg-pes-template.c" +#line 42 "packet-mpeg-pes-template.c" static int proto_mpeg = -1; static int proto_mpeg_pes = -1; @@ -1109,7 +1108,7 @@ proto_register_mpeg_pes(void) "mpeg_pes.BIT_STRING_SIZE_16", HFILL }}, /*--- End of included file: packet-mpeg-pes-hfarr.c ---*/ -#line 467 "packet-mpeg-pes-template.c" +#line 466 "packet-mpeg-pes-template.c" { &hf_mpeg_pes_pack_header, { "Pack header", "mpeg-pes.pack", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -1205,7 +1204,7 @@ proto_register_mpeg_pes(void) &ett_mpeg_pes_Picture, /*--- End of included file: packet-mpeg-pes-ettarr.c ---*/ -#line 552 "packet-mpeg-pes-template.c" +#line 551 "packet-mpeg-pes-template.c" &ett_mpeg_pes_pack_header, &ett_mpeg_pes_header_data, }; diff --git a/epan/dissectors/packet-q932.c b/epan/dissectors/packet-q932.c index 3c1b3ef536..c9321c0634 100644 --- a/epan/dissectors/packet-q932.c +++ b/epan/dissectors/packet-q932.c @@ -36,7 +36,6 @@ #endif #include -#include #include #include #include @@ -97,7 +96,7 @@ static int hf_q932_destinationEntity = -1; /* EntityType */ static int hf_q932_destinationEntityAddress = -1; /* AddressInformation */ /*--- End of included file: packet-q932-hf.c ---*/ -#line 51 "packet-q932-template.c" +#line 50 "packet-q932-template.c" /* Initialize the subtree pointers */ static gint ett_q932 = -1; @@ -120,7 +119,7 @@ static gint ett_q932_UserSpecifiedSubaddress = -1; static gint ett_q932_NetworkFacilityExtension_U = -1; /*--- End of included file: packet-q932-ett.c ---*/ -#line 56 "packet-q932-template.c" +#line 55 "packet-q932-template.c" /* Preferences */ @@ -636,7 +635,7 @@ static void dissect_InterpretationComponent_PDU(tvbuff_t *tvb _U_, packet_info * /*--- End of included file: packet-q932-fn.c ---*/ -#line 126 "packet-q932-template.c" +#line 125 "packet-q932-template.c" /*--- dissect_q932_facility_ie -------------------------------------------------------*/ /*static*/ void @@ -958,7 +957,7 @@ void proto_register_q932(void) { "q932.AddressInformation", HFILL }}, /*--- End of included file: packet-q932-hfarr.c ---*/ -#line 295 "packet-q932-template.c" +#line 294 "packet-q932-template.c" }; /* List of subtrees */ @@ -983,7 +982,7 @@ void proto_register_q932(void) { &ett_q932_NetworkFacilityExtension_U, /*--- End of included file: packet-q932-ettarr.c ---*/ -#line 302 "packet-q932-template.c" +#line 301 "packet-q932-template.c" }; /* Register protocol and dissector */ diff --git a/epan/dissectors/packet-qsig.c b/epan/dissectors/packet-qsig.c index 84b789ae27..bd3e978eeb 100644 --- a/epan/dissectors/packet-qsig.c +++ b/epan/dissectors/packet-qsig.c @@ -36,7 +36,6 @@ #endif #include -#include #include #include #include @@ -487,7 +486,7 @@ static const value_string qsig_str_operation[] = { { 120, "mIDMailboxID" }, /*--- End of included file: packet-qsig-table10.c ---*/ -#line 274 "packet-qsig-template.c" +#line 273 "packet-qsig-template.c" { 0, NULL} }; @@ -664,7 +663,7 @@ static const value_string qsig_str_error[] = { { 1008, "unspecified" }, /*--- End of included file: packet-qsig-table20.c ---*/ -#line 279 "packet-qsig-template.c" +#line 278 "packet-qsig-template.c" { 0, NULL} }; @@ -1559,7 +1558,7 @@ static int hf_qsig_mid_multipleExtension = -1; /* SEQUENCE_OF_Extension */ static int hf_qsig_mid_multipleExtension_item = -1; /* Extension */ /*--- End of included file: packet-qsig-hf.c ---*/ -#line 295 "packet-qsig-template.c" +#line 294 "packet-qsig-template.c" static int *hf_qsig_ie_type_arr[] = { NULL, @@ -2019,7 +2018,7 @@ static gint ett_qsig_mid_MIDExtensions = -1; static gint ett_qsig_mid_SEQUENCE_OF_Extension = -1; /*--- End of included file: packet-qsig-ett.c ---*/ -#line 312 "packet-qsig-template.c" +#line 311 "packet-qsig-template.c" /* Preferences */ @@ -11896,7 +11895,7 @@ static int dissect_qsig_mid_Extension_PDU(tvbuff_t *tvb _U_, packet_info *pinfo /*--- End of included file: packet-qsig-fn.c ---*/ -#line 322 "packet-qsig-template.c" +#line 321 "packet-qsig-template.c" typedef struct _qsig_op_t { gint32 opcode; @@ -12114,7 +12113,7 @@ static const qsig_op_t qsig_op_tab[] = { /* mIDMailboxID */ { 120, dissect_qsig_mid_MIDMailboxIDArg_PDU, dissect_qsig_mid_MIDDummyRes_PDU }, /*--- End of included file: packet-qsig-table11.c ---*/ -#line 331 "packet-qsig-template.c" +#line 330 "packet-qsig-template.c" }; typedef struct _qsig_err_t { @@ -12295,7 +12294,7 @@ static const qsig_err_t qsig_err_tab[] = { /* unspecified */ { 1008, dissect_qsig_mid_Extension_PDU }, /*--- End of included file: packet-qsig-table21.c ---*/ -#line 340 "packet-qsig-template.c" +#line 339 "packet-qsig-template.c" }; static const qsig_op_t *get_op(gint32 opcode) { @@ -15810,7 +15809,7 @@ void proto_register_qsig(void) { "qsig.Extension", HFILL }}, /*--- End of included file: packet-qsig-hfarr.c ---*/ -#line 617 "packet-qsig-template.c" +#line 616 "packet-qsig-template.c" }; /* List of subtrees */ @@ -16261,7 +16260,7 @@ void proto_register_qsig(void) { &ett_qsig_mid_SEQUENCE_OF_Extension, /*--- End of included file: packet-qsig-ettarr.c ---*/ -#line 625 "packet-qsig-template.c" +#line 624 "packet-qsig-template.c" }; /* Register protocol and dissector */ diff --git a/epan/dissectors/packet-t125.c b/epan/dissectors/packet-t125.c index 5742100717..df52f369dd 100644 --- a/epan/dissectors/packet-t125.c +++ b/epan/dissectors/packet-t125.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-t125.c */ -/* ../../tools/asn2wrs.py -b -p t125 -c ./t125.cnf -s ./packet-t125-template -D . MCS-PROTOCOL.asn */ +/* ../../tools/asn2wrs.py -b -p t125 -c t125.cnf -s packet-t125-template MCS-PROTOCOL.asn */ /* Input file: packet-t125-template.c */ @@ -43,7 +43,6 @@ #include #include -#include #include #include #include "packet-ber.h" @@ -177,7 +176,7 @@ static int hf_t125_Segmentation_begin = -1; static int hf_t125_Segmentation_end = -1; /*--- End of included file: packet-t125-hf.c ---*/ -#line 51 "packet-t125-template.c" +#line 50 "packet-t125-template.c" /* Initialize the subtree pointers */ static int ett_t125 = -1; @@ -253,7 +252,7 @@ static gint ett_t125_ConnectMCSPDU = -1; static gint ett_t125_DomainMCSPDU = -1; /*--- End of included file: packet-t125-ett.c ---*/ -#line 55 "packet-t125-template.c" +#line 54 "packet-t125-template.c" /*--- Included file: packet-t125-fn.c ---*/ @@ -2126,7 +2125,7 @@ static int dissect_ConnectMCSPDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-t125-fn.c ---*/ -#line 57 "packet-t125-template.c" +#line 56 "packet-t125-template.c" static int dissect_t125(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree) @@ -2636,7 +2635,7 @@ void proto_register_t125(void) { "", HFILL }}, /*--- End of included file: packet-t125-hfarr.c ---*/ -#line 98 "packet-t125-template.c" +#line 97 "packet-t125-template.c" }; /* List of subtrees */ @@ -2714,7 +2713,7 @@ void proto_register_t125(void) { &ett_t125_DomainMCSPDU, /*--- End of included file: packet-t125-ettarr.c ---*/ -#line 104 "packet-t125-template.c" +#line 103 "packet-t125-template.c" }; /* Register protocol */ -- cgit v1.2.3