Remove stuff that's really "non-public" from .h files.

(Include in .c files as needed).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27616 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/dissectors/packet-miop.c b/epan/dissectors/packet-miop.c
index 27089ea29121ad2e1bd2b12ec2052cbc64b81318..67296883012b1c3d0789f2bd9664316bbf42106b 100644 (file)
--- a/epan/dissectors/packet-miop.c
+++ b/epan/dissectors/packet-miop.c
@@ -97,6 +97,7 @@ static gint ett_miop_unique_id = -1;
 
 #define MIOP_MAGIC      "MIOP"
 
+static void dissect_miop (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree);
 
 static gboolean
 dissect_miop_heur (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) {

diff --git a/epan/dissectors/packet-miop.h b/epan/dissectors/packet-miop.h
index 54710a0914774b2bf1a718963fe252b29a432061..de35661ac87bcc46a9ef84ef3044c04657f8a403 100644 (file)
--- a/epan/dissectors/packet-miop.h
+++ b/epan/dissectors/packet-miop.h
@@ -52,11 +52,4 @@ typedef struct PacketHeader_1_0 {
   /* UniqueId id; */
 } PacketHeader;
 
-
-static void dissect_miop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-
-void proto_register_miop();
-
-void proto_reg_handoff_miop();
-
 #endif /* PACKET_MIOP_H */

diff --git a/epan/dissectors/packet-ziop.c b/epan/dissectors/packet-ziop.c
index 9828d280e4ef7b2f0b704a2c6b506df84ba44a3e..999481ea0789930fc32d822167f37c20a1264ee2 100644 (file)
--- a/epan/dissectors/packet-ziop.c
+++ b/epan/dissectors/packet-ziop.c
@@ -67,14 +67,12 @@
  * ------------------------------------------------------------------------------------------+
  */
 
-
 static int proto_ziop = -1;
 
 /*
  * (sub)Tree declares
  */
 
-
 static gint hf_ziop_magic = -1;
 static gint hf_ziop_giop_version_major = -1;
 static gint hf_ziop_giop_version_minor = -1;
@@ -126,9 +124,9 @@ static const value_string giop_message_types[] = {
 };
 
 
-
 gboolean ziop_desegment = TRUE;
 
+static void dissect_ziop (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree);
 
 static guint
 get_ziop_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset)
@@ -224,17 +222,9 @@ dissect_ziop_heur (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) {
 }
 
 
-
-
-
-
-
-
-
-
-
 /* Main entry point */
-void dissect_ziop (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) {
+static void 
+dissect_ziop (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) {
   guint offset = 0;
   ZIOPHeader header;
   CompressionData compression_data;
@@ -382,10 +372,10 @@ void proto_register_ziop (void) {
         "ZIOPHeader magic", HFILL }},
     { &hf_ziop_giop_version_major,
       { "Header major version", "ziop.giop_version_major", FT_UINT8, BASE_OCT, NULL, 0x0,
-        "ZIOPHeader giop_version", HFILL }},
+        "ZIOPHeader giop_major_version", HFILL }},
     { &hf_ziop_giop_version_minor,
       { "Header minor version", "ziop.giop_version_minor", FT_UINT8, BASE_OCT, NULL, 0x0,
-        "ZIOPHeader giop_version", HFILL }},
+        "ZIOPHeader giop_minor_version", HFILL }},
     { &hf_ziop_flags,
       { "Header flags", "ziop.flags", FT_UINT8, BASE_OCT, NULL, 0x0,
         "ZIOPHeader flags", HFILL }},

diff --git a/epan/dissectors/packet-ziop.h b/epan/dissectors/packet-ziop.h
index 7d7dbb2a61fd658272f25397a3fa0eb637a21628..d7d1a8e7405ac0c54c2eb6d5cf84eb9626b978c5 100644 (file)
--- a/epan/dissectors/packet-ziop.h
+++ b/epan/dissectors/packet-ziop.h
@@ -55,17 +55,7 @@ typedef struct ZIOP_CompressionData {
   /* Compression::Buffer data; */
 } CompressionData;
 
-
-
-
-
-extern void dissect_ziop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-
 gboolean
 dissect_ziop_heur (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree);
 
-void proto_register_ziop();
-
-void proto_reg_handoff_ziop();
-
 #endif /* PACKET_ZIOP_H */