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-x25.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-x25.c')
| -rw-r--r-- | epan/dissectors/packet-x25.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/epan/dissectors/packet-x25.c b/epan/dissectors/packet-x25.c index f921529163..fcb021ea3f 100644 --- a/epan/dissectors/packet-x25.c +++ b/epan/dissectors/packet-x25.c @@ -1410,8 +1410,7 @@ x25_ntoa(proto_tree *tree, int *offset, tvbuff_t *tvb, *second = '\0'; if (len1) { - if (check_col(pinfo->cinfo, COL_RES_DL_DST)) - col_add_str(pinfo->cinfo, COL_RES_DL_DST, addr1); + col_add_str(pinfo->cinfo, COL_RES_DL_DST, addr1); if (tree) proto_tree_add_text(tree, tvb, *offset, (len1 + 1) / 2, @@ -1421,8 +1420,7 @@ x25_ntoa(proto_tree *tree, int *offset, tvbuff_t *tvb, addr1); } if (len2) { - if (check_col(pinfo->cinfo, COL_RES_DL_SRC)) - col_add_str(pinfo->cinfo, COL_RES_DL_SRC, addr2); + col_add_str(pinfo->cinfo, COL_RES_DL_SRC, addr2); if (tree) proto_tree_add_text(tree, tvb, *offset + len1/2, (len2+1)/2+(len1%2+(len2+1)%2)/2, @@ -1499,8 +1497,7 @@ x25_toa(proto_tree *tree, int *offset, tvbuff_t *tvb, *second = '\0'; if (len1) { - if (check_col(pinfo->cinfo, COL_RES_DL_DST)) - col_add_str(pinfo->cinfo, COL_RES_DL_DST, addr1); + col_add_str(pinfo->cinfo, COL_RES_DL_DST, addr1); if (tree) proto_tree_add_text(tree, tvb, *offset, (len1 + 1) / 2, @@ -1508,8 +1505,7 @@ x25_toa(proto_tree *tree, int *offset, tvbuff_t *tvb, addr1); } if (len2) { - if (check_col(pinfo->cinfo, COL_RES_DL_SRC)) - col_add_str(pinfo->cinfo, COL_RES_DL_SRC, addr2); + col_add_str(pinfo->cinfo, COL_RES_DL_SRC, addr2); if (tree) proto_tree_add_text(tree, tvb, *offset + len1/2, (len2+1)/2+(len1%2+(len2+1)%2)/2, |