diff options
author | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-11-12 20:17:43 +0000 |
---|---|---|
committer | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-11-12 20:17:43 +0000 |
commit | ebc1bc3a6cd4d2ded09ef61bf2d9cb108c989d6e (patch) | |
tree | b29d7d235fb2eb96c66d10b3c582936ee030cb90 /epan/dissectors/packet-netperfmeter.c | |
parent | edb4fdbd8ed9edcd7bc1961f20aaa1472d70f79e (diff) |
Remove some unneeded 'if(pinfo)' tests;
Remove some unneeded forward refs.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39809 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-netperfmeter.c')
-rw-r--r-- | epan/dissectors/packet-netperfmeter.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-netperfmeter.c b/epan/dissectors/packet-netperfmeter.c index d1a50e9f05..5ccbb8db21 100644 --- a/epan/dissectors/packet-netperfmeter.c +++ b/epan/dissectors/packet-netperfmeter.c @@ -374,7 +374,7 @@ dissect_npmp_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *npmp guint8 type; type = tvb_get_guint8(message_tvb, offset_message_type); - if (pinfo && (check_col(pinfo->cinfo, COL_INFO))) { + if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, "%s ", val_to_str(type, message_type_values, "Unknown NetPerfMeterProtocol type")); } @@ -417,9 +417,7 @@ dissect_npmp(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree) proto_item *npmp_item; proto_tree *npmp_tree; - /* pinfo is NULL only if dissect_npmp_message is called from dissect_error cause */ - if (pinfo) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "NetPerfMeterProtocol"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "NetPerfMeterProtocol"); /* In the interest of speed, if "tree" is NULL, don't do any work not necessary to generate protocol tree items. */ |