From Didier Gautheron:

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

diff --git a/epan/dissectors/packet-ipdc.c b/epan/dissectors/packet-ipdc.c
index 23f99cda5a7277ce8e865a5f2b032329b3754d33..78cd3cba8bc35983a963378915818ddc2d98b3fc 100644 (file)
--- a/epan/dissectors/packet-ipdc.c
+++ b/epan/dissectors/packet-ipdc.c
@@ -38,7 +38,6 @@
 #include <math.h>
 
 #include <epan/packet.h>
-#include <epan/emem.h>
 #include "packet-ipdc.h"
 #include "packet-tcp.h"
 #include <epan/ipproto.h>
@@ -105,8 +104,7 @@ dissect_ipdc_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         guint16 offset;
 
         /* display IPDC protocol ID */
-        if (check_col(pinfo->cinfo, COL_PROTOCOL))
-                col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPDC");
+        col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPDC");
 
        /* short frame... */
        if (payload_len < 4)
@@ -150,8 +148,6 @@ dissect_ipdc_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                         val_to_str(message_code, message_code_vals,
                         TEXT_UNDEFINED));
 
-       if (!tree)
-               return;
 
        ti = proto_tree_add_item(tree, proto_ipdc, tvb, 0, -1, FALSE);
        ipdc_tree = proto_item_add_subtree(ti, ett_ipdc);
@@ -205,7 +201,7 @@ dissect_ipdc_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                switch (type) {
                        /* simple IPDC_ASCII strings */
                        case IPDC_ASCII:
-                               g_assert(len<=IPDC_STR_LEN);
+                               DISSECTOR_ASSERT(len<=IPDC_STR_LEN);
                                tvb_memcpy(tvb, tmp_tag_text, offset+2, len);
                                tmp_tag_text[len] = 0;
                                proto_tree_add_text(tag_tree, tvb, offset,
@@ -368,25 +364,25 @@ proto_register_ipdc(void)
                { &hf_ipdc_payload_len,
                        { "Payload length",     "ipdc.length",
                        FT_UINT16, BASE_DEC, NULL, 0x0,
-                       "Payload length", HFILL }
+                       NULL, HFILL }
                },
 
                { &hf_ipdc_protocol_id,
                        { "Protocol ID",        "ipdc.protocol_id",
                        FT_UINT8, BASE_HEX, NULL, 0x0,
-                       "Protocol ID", HFILL }
+                       NULL, HFILL }
                },
 
                { &hf_ipdc_trans_id_size,
                        { "Transaction ID size",        "ipdc.trans_id_size",
                        FT_UINT8, BASE_DEC, NULL, 0x0,
-                       "Transaction ID size", HFILL }
+                       NULL, HFILL }
                },
 
                { &hf_ipdc_trans_id,
                        { "Transaction ID",     "ipdc.trans_id",
-                       FT_BYTES, BASE_HEX, NULL, 0x0,
-                       "Transaction ID", HFILL }
+                       FT_BYTES, BASE_NONE, NULL, 0x0,
+                       NULL, HFILL }
                },
 
                { &hf_ipdc_message_code,