Get rid of check_col().
authoretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>
Thu, 8 Apr 2010 15:51:44 +0000 (15:51 +0000)
committeretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>
Thu, 8 Apr 2010 15:51:44 +0000 (15:51 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32428 f5534014-38df-0310-8fa8-9805f1628bb7

gtk/compare_stat.c
plugins/profinet/packet-pn-dcp.c
plugins/profinet/packet-pn-mrp.c
plugins/profinet/packet-pn-mrrt.c

index 83afe723c5f4d5122acb48eb9a85be9cffa66987..4a4fb77f2b2a2a6eba951fffd174314afad64b59 100644 (file)
@@ -216,7 +216,7 @@ comparestat_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const
 
        /* Set up the new order to create the zebra effect */
        fInfoTemp=se_tree_lookup32(cs->packet_tree, pinfo->fd->num);
-       if(check_col(pinfo->cinfo, COL_INFO)&&(fInfoTemp!=NULL)){
+       if((fInfoTemp!=NULL)){
                col_set_time(pinfo->cinfo, COL_INFO, &fInfoTemp->zebra_time, "ZebraTime");
        }
 
index 5269739917fa950c58d9cd1edd63541133e0a11c..3dfa7d4c4d88072685fd122151beb05f423da672 100644 (file)
@@ -339,8 +339,7 @@ dissect_PNDCP_Option(tvbuff_t *tvb, int offset, packet_info *pinfo,
         val_to_str(option, pn_dcp_option, "Unknown"), val_to_str(suboption, val_str, "Unknown"));
 
     if(append_col) {
-        if (check_col(pinfo->cinfo, COL_INFO))
-            col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", val_to_str(suboption, val_str, "Unknown"));
+        col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", val_to_str(suboption, val_str, "Unknown"));
     }
 
     return offset;
index 18a3893e5da2e2df68f6b58ad37388dc9f8af285..306c71e539934c523978bd5a9e3fbbc757214e13 100644 (file)
@@ -361,8 +361,7 @@ dissect_PNMRP_PDU(tvbuff_t *tvb, int offset,
         default:
             offset = dissect_pn_undecoded(tvb, offset, pinfo, tree, length);
 
-            if (check_col(pinfo->cinfo, COL_INFO))
-                   col_append_fstr(pinfo->cinfo, COL_INFO, "Unknown TLVType 0x%x", type);
+               col_append_fstr(pinfo->cinfo, COL_INFO, "Unknown TLVType 0x%x", type);
            proto_item_append_text(item, "Unknown TLVType 0x%x", type);
         }
     }
index def0e49a7f6ffe40e183a723effe283d20a96446..493bbeb97ea16b96a4876002b95cfa56da745915 100644 (file)
@@ -152,8 +152,7 @@ dissect_PNMRRT_PDU(tvbuff_t *tvb, int offset,
         default:
             offset = dissect_pn_undecoded(tvb, offset, pinfo, tree, length);
 
-           if (check_col(pinfo->cinfo, COL_INFO))
-                   col_append_fstr(pinfo->cinfo, COL_INFO, "Unknown TLVType 0x%x", type);
+           col_append_fstr(pinfo->cinfo, COL_INFO, "Unknown TLVType 0x%x", type);
            proto_item_append_text(item, "Unknown TLVType 0x%x", type);
         }
     }