diff options
| author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-09-26 09:01:17 +0000 |
|---|---|---|
| committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-09-26 09:01:17 +0000 |
| commit | aa9957ab039e676cffa11c1021ff1ca3192cad6c (patch) | |
| tree | a281dce3d949029c1d21e15e10d5e61c9c5be2b5 /epan/dissectors/packet-cimd.c | |
| parent | 4e376315e618955f6e0228944f8ca09cd70ef18b (diff) | |
Get rid of check_col, while at it set ENC.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39147 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-cimd.c')
| -rw-r--r-- | epan/dissectors/packet-cimd.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/epan/dissectors/packet-cimd.c b/epan/dissectors/packet-cimd.c index fd4802125c..59c33c82fe 100644 --- a/epan/dissectors/packet-cimd.c +++ b/epan/dissectors/packet-cimd.c @@ -612,7 +612,7 @@ dissect_cimd_operation(tvbuff_t *tvb, proto_tree *tree, gint etxp, guint16 check if (tree) { /* create display subtree for the protocol */ - cimd_item = proto_tree_add_item(tree, proto_cimd, tvb, 0, etxp + 1, TRUE); + cimd_item = proto_tree_add_item(tree, proto_cimd, tvb, 0, etxp + 1, ENC_LITTLE_ENDIAN); cimd_tree = proto_item_add_subtree(cimd_item, ett_cimd); proto_tree_add_uint(cimd_tree, hf_cimd_opcode_indicator, tvb, CIMD_OC_OFFSET, CIMD_OC_LENGTH, OC); proto_tree_add_uint(cimd_tree, hf_cimd_packet_number_indicator, tvb, CIMD_PN_OFFSET, CIMD_PN_LENGTH, PN); @@ -683,13 +683,10 @@ dissect_cimd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Make entries in Protocol column on summary display */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "CIMD"); - if (check_col(pinfo->cinfo, COL_INFO)) - { - if (checksumIsValid) - col_add_str(pinfo->cinfo, COL_INFO, val_to_str(OC, vals_hdr_OC, "Unknown (%d)")); - else - col_add_fstr(pinfo->cinfo, COL_INFO, "%s - %s", val_to_str(OC, vals_hdr_OC, "Unknown (%d)"), "invalid checksum"); - } + if (checksumIsValid) + col_add_str(pinfo->cinfo, COL_INFO, val_to_str(OC, vals_hdr_OC, "Unknown (%d)")); + else + col_add_fstr(pinfo->cinfo, COL_INFO, "%s - %s", val_to_str(OC, vals_hdr_OC, "Unknown (%d)"), "invalid checksum"); dissect_cimd_operation(tvb, tree, etxp, checksum, last1, OC, PN); } |