Remove unneeded #include; As needed: Add editor modelines & do whitespace changes.

Change-Id: Ib345833114aab0c70fc20b1fc74c90abecec486e
Reviewed-on: https://code.wireshark.org/review/3619
Reviewed-by: Bill Meier <wmeier@newsguy.com>

8 files changed, 81 insertions, 22 deletions

diff --git a/epan/dissectors/packet-fcct.c b/epan/dissectors/packet-fcct.c
index 41dd023134..9f18905a22 100644
--- a/epan/dissectors/packet-fcct.c
+++ b/epan/dissectors/packet-fcct.c
@@ -28,7 +28,6 @@
 #include <epan/packet.h>
 #include <epan/to_str.h>
 #include <epan/etypes.h>
-#include <epan/conversation.h>
 #include "packet-fc.h"
 #include "packet-fcct.h"
 
@@ -221,10 +220,6 @@ dissect_fcct (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
 
 /* Register the protocol with Wireshark */
 
-/* this format is require because a script is used to build the C function
-   that calls all the protocol registration.
-*/
-
 void
 proto_register_fcct(void)
 {
@@ -285,10 +280,6 @@ proto_register_fcct(void)
                                                    FT_UINT8, BASE_HEX);
 }
 
-/* If this dissector uses sub-dissector registration add a registration routine.
-   This format is required because a script is used to find these routines and
-   create the code that calls these routines.
-*/
 void
 proto_reg_handoff_fcct (void)
 {
@@ -300,4 +291,15 @@ proto_reg_handoff_fcct (void)
     data_handle = find_dissector ("data");
 }
 
-
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */
diff --git a/epan/dissectors/packet-fcsp.c b/epan/dissectors/packet-fcsp.c
index 205ab0bf66..c387210444 100644
--- a/epan/dissectors/packet-fcsp.c
+++ b/epan/dissectors/packet-fcsp.c
@@ -28,7 +28,6 @@
 
 #include <epan/packet.h>
 #include <epan/to_str.h>
-#include <epan/conversation.h>
 #include <epan/expert.h>
 #include <epan/etypes.h>
 #include "packet-fc.h"
@@ -620,3 +619,15 @@ proto_register_fcsp(void)
     expert_register_field_array(expert_fcsp, ei, array_length(ei));
 }
 
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */
diff --git a/epan/dissectors/packet-ipfc.c b/epan/dissectors/packet-ipfc.c
index 23ba70684b..21b8757cbe 100644
--- a/epan/dissectors/packet-ipfc.c
+++ b/epan/dissectors/packet-ipfc.c
@@ -32,7 +32,6 @@
 #include <wiretap/wtap.h>
 #include <epan/to_str.h>
 #include <epan/etypes.h>
-#include <epan/conversation.h>
 
 #include "packet-fc.h"
 #include "packet-ipfc.h"
@@ -136,3 +135,16 @@ proto_reg_handoff_ipfc (void)
 
     llc_handle = find_dissector ("llc");
 }
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */
diff --git a/epan/dissectors/packet-rtp-midi.c b/epan/dissectors/packet-rtp-midi.c
index cbe9492b20..0f63249ae3 100644
--- a/epan/dissectors/packet-rtp-midi.c
+++ b/epan/dissectors/packet-rtp-midi.c
@@ -53,7 +53,6 @@
 #include <epan/packet.h>
 #include <epan/exceptions.h>
 #include <epan/prefs.h>
-#include <epan/conversation.h>
 #include <epan/tap.h>
 
 void proto_register_rtp_midi(void);
diff --git a/epan/dissectors/packet-usb-masstorage.c b/epan/dissectors/packet-usb-masstorage.c
index 8ac950c1c2..8d36a580b6 100644
--- a/epan/dissectors/packet-usb-masstorage.c
+++ b/epan/dissectors/packet-usb-masstorage.c
@@ -24,7 +24,6 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/wmem/wmem.h>
-#include <epan/conversation.h>
 #include "packet-usb.h"
 #include "packet-scsi.h"
 
@@ -53,15 +52,15 @@ static gint ett_usb_ms = -1;
 
 /* there is one such structure for each masstorage conversation */
 typedef struct _usb_ms_conv_info_t {
-    wmem_tree_t *itl;		/* indexed by LUN */
-    wmem_tree_t *itlq;		/* pinfo->fd->num */
+    wmem_tree_t *itl;           /* indexed by LUN */
+    wmem_tree_t *itlq;          /* pinfo->fd->num */
 } usb_ms_conv_info_t;
 
 
 static const value_string status_vals[] = {
-    {0x00,	"Command Passed"},
-    {0x01,	"Command Failed"},
-    {0x02,	"Phase Error"},
+    {0x00,      "Command Passed"},
+    {0x01,      "Command Failed"},
+    {0x02,      "Phase Error"},
     {0, NULL}
 };
 
@@ -468,3 +467,16 @@ proto_reg_handoff_usb_ms(void)
 
     heur_dissector_add("usb.bulk", dissect_usb_ms_bulk_heur, proto_usb_ms);
 }
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */
diff --git a/epan/dissectors/packet-usb-video.c b/epan/dissectors/packet-usb-video.c
index 71f81773c8..17fb6cda36 100644
--- a/epan/dissectors/packet-usb-video.c
+++ b/epan/dissectors/packet-usb-video.c
@@ -27,7 +27,6 @@
 #include <epan/expert.h>
 #include <epan/packet.h>
 #include <epan/wmem/wmem.h>
-#include <epan/conversation.h>
 #include "packet-usb.h"
 
 void proto_register_usb_vid(void);
diff --git a/epan/dissectors/packet-v5dl.c b/epan/dissectors/packet-v5dl.c
index 0b5d378aa6..fa84967c6d 100644
--- a/epan/dissectors/packet-v5dl.c
+++ b/epan/dissectors/packet-v5dl.c
@@ -35,7 +35,6 @@
 #include <glib.h>
 
 #include <epan/packet.h>
-#include <epan/conversation.h>
 #include <epan/xdlc.h>
 #include <epan/crc16-tvb.h>
 
@@ -442,3 +441,16 @@ proto_reg_handoff_v5dl(void)
 {
 	v52_handle = find_dissector("v52");
 }
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 8
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * End:
+ *
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
+ */
diff --git a/epan/dissectors/packet-v5ef.c b/epan/dissectors/packet-v5ef.c
index a721fa61a4..6fbb6f1cb7 100644
--- a/epan/dissectors/packet-v5ef.c
+++ b/epan/dissectors/packet-v5ef.c
@@ -35,7 +35,6 @@
 
 #include <epan/packet.h>
 #include <wiretap/wtap.h>
-#include <epan/conversation.h>
 #include <epan/xdlc.h>
 #include <epan/crc16-tvb.h>
 
@@ -206,3 +205,16 @@ proto_reg_handoff_v5ef(void)
 	lapd_handle = find_dissector("lapd");
 	v5dl_handle = find_dissector("v5dl");
 }
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 8
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * End:
+ *
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
+ */