diff options
author | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-08-09 07:59:51 +0000 |
---|---|---|
committer | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-08-09 07:59:51 +0000 |
commit | 7a1740736d1aca5c3f0e07951327d24056237c5c (patch) | |
tree | ef21c459b918013ddfaded20b267565537e9bf64 /epan/dissectors/packet-bat.c | |
parent | b2e9a22ec53becba2c23777ffee4ff375d135698 (diff) |
Don't guard col_set_str (COL_INFO/COL_PROTOCOL) with col_check
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29345 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-bat.c')
-rw-r--r-- | epan/dissectors/packet-bat.c | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/epan/dissectors/packet-bat.c b/epan/dissectors/packet-bat.c index 5ea8831159..e9f3a468f4 100644 --- a/epan/dissectors/packet-bat.c +++ b/epan/dissectors/packet-bat.c @@ -132,9 +132,7 @@ static void dissect_bat_batman(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr guint8 version; /* set protocol name */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "BAT_BATMAN"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "BAT_BATMAN"); version = tvb_get_guint8(tvb, 0); switch (version) { @@ -336,9 +334,7 @@ static void dissect_bat_gw(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ip_addr = tvb_get_ptr(tvb, ip_pos, 4); /* set protocol name */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "BAT_GW"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "BAT_GW"); /* Set info column */ if (check_col(pinfo->cinfo, COL_INFO)) { @@ -396,9 +392,7 @@ static void dissect_bat_vis(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 version; /* set protocol name */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "BAT_VIS"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "BAT_VIS"); version = tvb_get_guint8(tvb, 4); switch (version) { @@ -439,9 +433,7 @@ static void dissect_bat_vis_v22(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t vis_packeth->tq_max = tvb_get_ntohs(tvb, 6); /* set protocol name */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "BAT_VIS"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "BAT_VIS"); /* Set info column */ if (check_col(pinfo->cinfo, COL_INFO)) { @@ -574,9 +566,7 @@ static void dissect_bat_vis_v23(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t vis_packeth->tq_max = tvb_get_guint8(tvb, 6); /* set protocol name */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "BAT_VIS"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "BAT_VIS"); /* Set info column */ if (check_col(pinfo->cinfo, COL_INFO)) { |