diff options
author | Anders Broman <anders.broman@ericsson.com> | 2010-01-13 20:32:01 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2010-01-13 20:32:01 +0000 |
commit | 440c3f9261af41a397823a80121cfa0122df1c88 (patch) | |
tree | 64b368c46b53e0e8f52e80f61ed17e13d64596a5 /epan/dissectors/packet-uts.c | |
parent | 6343ffb68e3e7ea3b335ad5e443e23f324a99d35 (diff) |
From Didier Gautheron:
check_col.diff
Remove redundant calls to check_col() if it guards only one columns function with one parameter after the column type.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4394
svn path=/trunk/; revision=31519
Diffstat (limited to 'epan/dissectors/packet-uts.c')
-rw-r--r-- | epan/dissectors/packet-uts.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-uts.c b/epan/dissectors/packet-uts.c index 90337cad6d..7da0fb220d 100644 --- a/epan/dissectors/packet-uts.c +++ b/epan/dissectors/packet-uts.c @@ -87,8 +87,7 @@ static int testchar(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, int op, g return 0; } } else { - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Unknown Message Format"); + col_set_str(pinfo->cinfo, COL_INFO, "Unknown Message Format"); return 0; } } @@ -131,8 +130,7 @@ dissect_uts(tvbuff_t *tvb, packet_info *pinfo _U_ , proto_tree *tree) enum { NOTRAFFIC, OTHER } msg_type = OTHER; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) /* set the protocol column on summary display */ - col_set_str(pinfo->cinfo, COL_PROTOCOL, "UTS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "UTS"); if (testchar(tvb, pinfo, 0, MATCH, EOT, NULL) && testchar(tvb, pinfo, 1, MATCH, EOT, NULL) && |