diff options
| author | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-09-30 13:30:35 +0000 |
|---|---|---|
| committer | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-09-30 13:30:35 +0000 |
| commit | 41971c5c2386065b8b7aa26906fb6b8ad5b292ef (patch) | |
| tree | 56d51e00abcbffebc14d9cdfe6fba5f5c66172f0 /epan/dissectors/packet-afp.c | |
| parent | d1be0f7422b18d9343eb9e6b7a2c914f839381f2 (diff) | |
Remove some unneeded (indirect) 'if(check_col()...)' guarding.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30213 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-afp.c')
| -rw-r--r-- | epan/dissectors/packet-afp.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c index 1cbbdd6657..e698570c7e 100644 --- a/epan/dissectors/packet-afp.c +++ b/epan/dissectors/packet-afp.c @@ -4112,8 +4112,7 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gint col_info = check_col(pinfo->cinfo, COL_INFO); col_set_str(pinfo->cinfo, COL_PROTOCOL, "AFP"); - if (col_info) - col_clear(pinfo->cinfo, COL_INFO); + col_clear(pinfo->cinfo, COL_INFO); conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); @@ -4146,8 +4145,7 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (!request_val) { /* missing request */ - if (col_info) - col_set_str(pinfo->cinfo, COL_INFO, "[Reply without query?]"); + col_set_str(pinfo->cinfo, COL_INFO, "[Reply without query?]"); return; } @@ -4180,13 +4178,11 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * .... * ip1:2048 --> ip2:548 <SYN> use the same port but it's a new session! */ - if (col_info) { - col_set_str(pinfo->cinfo, COL_INFO, - "[Error!IP port reused, you need to split the capture file]"); - expert_add_info_format(pinfo, ti, PI_SEQUENCE, PI_WARN, - "IP port reused, you need to split the capture file"); - return; - } + col_set_str(pinfo->cinfo, COL_INFO, + "[Error!IP port reused, you need to split the capture file]"); + expert_add_info_format(pinfo, ti, PI_SEQUENCE, PI_WARN, + "IP port reused, you need to split the capture file"); + return; } /* |