Remove unneeded #include <stdio.h>

[obnox/wireshark/wip.git] / epan / dissectors / packet-mesh.c

diff --git a/epan/dissectors/packet-mesh.c b/epan/dissectors/packet-mesh.c
index 6e601a839ea7457512f70d74b744232d5dd062f2..b7cfae5f3aceafa314f51258ac7f96e11f7a5bb0 100644 (file)
--- a/epan/dissectors/packet-mesh.c
+++ b/epan/dissectors/packet-mesh.c
@@ -28,7 +28,6 @@
 # include "config.h"
 #endif
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -55,8 +54,7 @@ dissect_mesh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   guint16 mesh_e2eseq; 
   
   /* Make entries in Protocol column and Info column on summary display */
-  if (check_col(pinfo->cinfo, COL_PROTOCOL)) 
-    col_set_str(pinfo->cinfo, COL_PROTOCOL, "Mesh");
+  col_set_str(pinfo->cinfo, COL_PROTOCOL, "Mesh");
   
   if (tree) {
     ti = proto_tree_add_item(tree, proto_mesh, tvb, 0, 5, FALSE);
@@ -88,11 +86,11 @@ proto_register_mesh(void)
   static hf_register_info hf[] = {
     { &hf_mesh_ttl,
       { "Mesh TTL", "mesh.ttl", FT_UINT8, BASE_DEC,
-        NULL, 0x0, "", HFILL }},
+        NULL, 0x0, NULL, HFILL }},
 
     { &hf_mesh_e2eseq,
       { "Mesh End-to-end Seq", "mesh.e2eseq", FT_UINT16, BASE_HEX,
-        NULL, 0x0, "", HFILL }},
+        NULL, 0x0, NULL, HFILL }},
   };
 
   /* Setup protocol subtree array */