diff options
author | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-02-07 16:01:26 +0000 |
---|---|---|
committer | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-02-07 16:01:26 +0000 |
commit | 5f727cba01115d518e322d1ec5696c88aaa7707d (patch) | |
tree | 83c40653e7ff2a47c1a79ce9c364953dcfb9a7f5 | |
parent | a5d59d93bc1605abcae4ef317d32b3f1c950576f (diff) |
#include <epan/conversation.h> not req'd ...
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27392 f5534014-38df-0310-8fa8-9805f1628bb7
-rw-r--r-- | asn1/mms/packet-mms-template.c | 1 | ||||
-rw-r--r-- | asn1/tcap/packet-tcap-template.c | 1 | ||||
-rw-r--r-- | epan/camel-persistentdata.c | 1 | ||||
-rw-r--r-- | epan/dissectors/packet-mms.c | 11 | ||||
-rw-r--r-- | epan/dissectors/packet-tcap.c | 13 | ||||
-rw-r--r-- | epan/h225-persistentdata.c | 1 | ||||
-rw-r--r-- | epan/tcap-persistentdata.c | 1 | ||||
-rw-r--r-- | file.c | 1 | ||||
-rw-r--r-- | gtk/t38_analysis.c | 1 | ||||
-rw-r--r-- | gtk/voip_calls.c | 1 | ||||
-rw-r--r-- | rawshark.c | 1 | ||||
-rw-r--r-- | tshark.c | 1 |
12 files changed, 11 insertions, 23 deletions
diff --git a/asn1/mms/packet-mms-template.c b/asn1/mms/packet-mms-template.c index d59c4d94d4..9f9078833b 100644 --- a/asn1/mms/packet-mms-template.c +++ b/asn1/mms/packet-mms-template.c @@ -29,7 +29,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/asn1.h> #include <stdio.h> diff --git a/asn1/tcap/packet-tcap-template.c b/asn1/tcap/packet-tcap-template.c index 8e4a80b09a..0bdf11dfa0 100644 --- a/asn1/tcap/packet-tcap-template.c +++ b/asn1/tcap/packet-tcap-template.c @@ -32,7 +32,6 @@ #include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> #include <epan/strutil.h> diff --git a/epan/camel-persistentdata.c b/epan/camel-persistentdata.c index 9b6db849fa..3e87a26f96 100644 --- a/epan/camel-persistentdata.c +++ b/epan/camel-persistentdata.c @@ -35,7 +35,6 @@ #include <epan/emem.h> #include "epan/packet.h" -#include "epan/conversation.h" #include "epan/tap.h" #include <epan/asn1.h> #include "epan/camel-persistentdata.h" diff --git a/epan/dissectors/packet-mms.c b/epan/dissectors/packet-mms.c index 4df02292d1..5c46dd5e14 100644 --- a/epan/dissectors/packet-mms.c +++ b/epan/dissectors/packet-mms.c @@ -37,7 +37,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/asn1.h> #include <stdio.h> @@ -718,7 +717,7 @@ static int hf_mms_Transitions_idle_to_active = -1; static int hf_mms_Transitions_any_to_deleted = -1; /*--- End of included file: packet-mms-hf.c ---*/ -#line 50 "packet-mms-template.c" +#line 49 "packet-mms-template.c" /* Initialize the subtree pointers */ static gint ett_mms = -1; @@ -932,7 +931,7 @@ static gint ett_mms_DirectoryEntry = -1; static gint ett_mms_FileAttributes = -1; /*--- End of included file: packet-mms-ett.c ---*/ -#line 54 "packet-mms-template.c" +#line 53 "packet-mms-template.c" /*--- Included file: packet-mms-fn.c ---*/ @@ -6883,7 +6882,7 @@ dissect_mms_MMSpdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, /*--- End of included file: packet-mms-fn.c ---*/ -#line 56 "packet-mms-template.c" +#line 55 "packet-mms-template.c" /* * Dissect MMS PDUs inside a PPDU. @@ -9562,7 +9561,7 @@ void proto_register_mms(void) { "", HFILL }}, /*--- End of included file: packet-mms-hfarr.c ---*/ -#line 98 "packet-mms-template.c" +#line 97 "packet-mms-template.c" }; /* List of subtrees */ @@ -9778,7 +9777,7 @@ void proto_register_mms(void) { &ett_mms_FileAttributes, /*--- End of included file: packet-mms-ettarr.c ---*/ -#line 104 "packet-mms-template.c" +#line 103 "packet-mms-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c index edc6721dba..cc07aa2186 100644 --- a/epan/dissectors/packet-tcap.c +++ b/epan/dissectors/packet-tcap.c @@ -40,7 +40,6 @@ #include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/conversation.h> #include <epan/oids.h> #include <epan/asn1.h> #include <epan/strutil.h> @@ -140,7 +139,7 @@ static int hf_tcap_AARQ_protocol_version_version1 = -1; static int hf_tcap_AARE_protocol_version_version1 = -1; /*--- End of included file: packet-tcap-hf.c ---*/ -#line 64 "packet-tcap-template.c" +#line 63 "packet-tcap-template.c" /* Initialize the subtree pointers */ static gint ett_tcap = -1; @@ -195,7 +194,7 @@ static gint ett_tcap_ABRT_user_information = -1; static gint ett_tcap_Associate_source_diagnostic = -1; /*--- End of included file: packet-tcap-ett.c ---*/ -#line 80 "packet-tcap-template.c" +#line 79 "packet-tcap-template.c" #define MAX_SSN 254 static range_t *global_ssn_range; @@ -1419,7 +1418,7 @@ static void dissect_DialoguePDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p /*--- End of included file: packet-tcap-fn.c ---*/ -#line 143 "packet-tcap-template.c" +#line 142 "packet-tcap-template.c" @@ -1542,7 +1541,7 @@ proto_reg_handoff_tcap(void) /*--- End of included file: packet-tcap-dis-tab.c ---*/ -#line 258 "packet-tcap-template.c" +#line 257 "packet-tcap-template.c" } static void init_tcap(void); @@ -1873,7 +1872,7 @@ proto_register_tcap(void) "", HFILL }}, /*--- End of included file: packet-tcap-hfarr.c ---*/ -#line 320 "packet-tcap-template.c" +#line 319 "packet-tcap-template.c" }; /* Setup protocol subtree array */ @@ -1922,7 +1921,7 @@ proto_register_tcap(void) &ett_tcap_Associate_source_diagnostic, /*--- End of included file: packet-tcap-ettarr.c ---*/ -#line 330 "packet-tcap-template.c" +#line 329 "packet-tcap-template.c" }; /*static enum_val_t tcap_options[] = { diff --git a/epan/h225-persistentdata.c b/epan/h225-persistentdata.c index 3b540dabe6..487113b810 100644 --- a/epan/h225-persistentdata.c +++ b/epan/h225-persistentdata.c @@ -32,7 +32,6 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/conversation.h> #include <epan/emem.h> #include <stdio.h> diff --git a/epan/tcap-persistentdata.c b/epan/tcap-persistentdata.c index 6c5f3e2e4a..46f2dd3de3 100644 --- a/epan/tcap-persistentdata.c +++ b/epan/tcap-persistentdata.c @@ -35,7 +35,6 @@ #include "epan/emem.h" #include "epan/packet.h" -#include "epan/conversation.h" #include "epan/asn1.h" #include "epan/tcap-persistentdata.h" #include "epan/dissectors/packet-tcap.h" @@ -67,7 +67,6 @@ #include "ui_util.h" #include <epan/prefs.h> #include <epan/dfilter/dfilter.h> -#include <epan/conversation.h> #include <epan/epan_dissect.h> #include <epan/tap.h> #include <epan/dissectors/packet-data.h> diff --git a/gtk/t38_analysis.c b/gtk/t38_analysis.c index 8233f71d3c..350747d27b 100644 --- a/gtk/t38_analysis.c +++ b/gtk/t38_analysis.c @@ -37,7 +37,6 @@ #include <epan/epan_dissect.h> #include <epan/dissectors/packet-t38.h> #include <epan/dissectors/packet-rtp.h> -#include <epan/conversation.h> #include <epan/stat_cmd_args.h> #include "../globals.h" diff --git a/gtk/voip_calls.c b/gtk/voip_calls.c index 4004aa4105..5471083097 100644 --- a/gtk/voip_calls.c +++ b/gtk/voip_calls.c @@ -59,7 +59,6 @@ #include <epan/dissectors/packet-sccp.h> #include <plugins/unistim/packet-unistim.h> #include <epan/dissectors/packet-skinny.h> -#include <epan/conversation.h> #include <epan/rtp_pt.h> #include "../globals.h" diff --git a/rawshark.c b/rawshark.c index 03e20435a6..dd5cc11036 100644 --- a/rawshark.c +++ b/rawshark.c @@ -87,7 +87,6 @@ #include "clopts_common.h" #include "cmdarg_err.h" #include "version_info.h" -#include <epan/conversation.h> #include <epan/plugins.h> #include "register.h" #include "conditions.h" @@ -77,7 +77,6 @@ #include "clopts_common.h" #include "cmdarg_err.h" #include "version_info.h" -#include <epan/conversation.h> #include <epan/plugins.h> #include "register.h" #include <epan/epan_dissect.h> |