Remove check_col() guard
authorkrj <krj@f5534014-38df-0310-8fa8-9805f1628bb7>
Thu, 24 Sep 2009 19:50:43 +0000 (19:50 +0000)
committerkrj <krj@f5534014-38df-0310-8fa8-9805f1628bb7>
Thu, 24 Sep 2009 19:50:43 +0000 (19:50 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30124 f5534014-38df-0310-8fa8-9805f1628bb7

30 files changed:
asn1/ocsp/packet-ocsp-template.c
asn1/pkixcmp/packet-cmp-template.c
asn1/pkixtsp/packet-pkixtsp-template.c
asn1/x509af/packet-x509af-template.c
epan/dissectors/packet-cmp.c
epan/dissectors/packet-dtn.c
epan/dissectors/packet-homeplug.c
epan/dissectors/packet-icmpv6.c
epan/dissectors/packet-ipsi-ctl.c
epan/dissectors/packet-iwarp-mpa.c
epan/dissectors/packet-ldss.c
epan/dissectors/packet-lwapp.c
epan/dissectors/packet-ncp2222.inc
epan/dissectors/packet-ncs.c
epan/dissectors/packet-nsrp.c
epan/dissectors/packet-ocsp.c
epan/dissectors/packet-oicq.c
epan/dissectors/packet-pcli.c
epan/dissectors/packet-pkixtsp.c
epan/dissectors/packet-x509af.c
epan/dissectors/packet-zbee-nwk.c
epan/dissectors/packet-zrtp.c
plugins/docsis/packet-dccack.c
plugins/docsis/packet-dccreq.c
plugins/docsis/packet-dccrsp.c
plugins/docsis/packet-dcd.c
plugins/docsis/packet-mdd.c
plugins/docsis/packet-regreqmp.c
plugins/docsis/packet-regrspmp.c
plugins/docsis/packet-sync.c

index 96f27e078782cb8cf4e635ba172455393b40e115..f18836ba18da870ee865ea71619f24e38981116b 100644 (file)
@@ -70,9 +70,7 @@ dissect_ocsp_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "OCSP");
 
-       if (check_col(pinfo->cinfo, COL_INFO)) {
-               col_set_str(pinfo->cinfo, COL_INFO, "Request");
-       }
+       col_set_str(pinfo->cinfo, COL_INFO, "Request");
 
 
        if(parent_tree){
@@ -94,9 +92,7 @@ dissect_ocsp_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "OCSP");
 
-       if (check_col(pinfo->cinfo, COL_INFO)) {
-               col_set_str(pinfo->cinfo, COL_INFO, "Response");
-       }
+       col_set_str(pinfo->cinfo, COL_INFO, "Response");
 
 
        if(parent_tree){
index 6c99a11c5747902b0954ba50aa74c3494e6b7862..1fa3a5f9224e10a3a257ac3e57927aa9073b8965 100644 (file)
@@ -124,9 +124,7 @@ static int dissect_cmp_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pa
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "CMP");
 
-       if (check_col(pinfo->cinfo, COL_INFO)) {
-               col_set_str(pinfo->cinfo, COL_INFO, "PKIXCMP");
-       }
+       col_set_str(pinfo->cinfo, COL_INFO, "PKIXCMP");
 
        if(parent_tree){
                item=proto_tree_add_item(parent_tree, proto_cmp, tvb, 0, -1, FALSE);
@@ -293,9 +291,7 @@ dissect_cmp_http(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "CMP");
 
-       if (check_col(pinfo->cinfo, COL_INFO)) {
-               col_set_str(pinfo->cinfo, COL_INFO, "PKIXCMP");
-       }
+       col_set_str(pinfo->cinfo, COL_INFO, "PKIXCMP");
 
        if(parent_tree){
                item=proto_tree_add_item(parent_tree, proto_cmp, tvb, 0, -1, FALSE);
index 01b5e74e055685a6bfb82cfd5449f4ab5bae16de..b9f51378bc3806ee81d6ab9643cc6576977cac1e 100644 (file)
@@ -66,9 +66,7 @@ dissect_timestamp_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "PKIXTSP");
 
-       if (check_col(pinfo->cinfo, COL_INFO)) {
-               col_set_str(pinfo->cinfo, COL_INFO, "Reply");
-       }
+       col_set_str(pinfo->cinfo, COL_INFO, "Reply");
 
 
        if(parent_tree){
@@ -89,9 +87,7 @@ dissect_timestamp_query(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "PKIXTSP");
 
-       if (check_col(pinfo->cinfo, COL_INFO)) {
-               col_set_str(pinfo->cinfo, COL_INFO, "Query");
-       }
+       col_set_str(pinfo->cinfo, COL_INFO, "Query");
 
 
        if(parent_tree){
index 5dbee96ca79fa64223fa3431ebfc5ebf32a9409a..08e01aff8cefbd3063c28d5ad70ac089a80cf4b9 100644 (file)
@@ -76,9 +76,7 @@ dissect_pkix_crl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "PKIX-CRL");
 
-       if (check_col(pinfo->cinfo, COL_INFO)) {
-               col_set_str(pinfo->cinfo, COL_INFO, "Certificate Revocation List");
-       }
+       col_set_str(pinfo->cinfo, COL_INFO, "Certificate Revocation List");
 
 
        if(parent_tree){
index 62031243bb3c118397dd262afbf29ecd05c8d2af..f0060775e9b20e4218e5a7108f30cc1a173a20c1 100644 (file)
@@ -1510,9 +1510,7 @@ static int dissect_cmp_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pa
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "CMP");
 
-       if (check_col(pinfo->cinfo, COL_INFO)) {
-               col_set_str(pinfo->cinfo, COL_INFO, "PKIXCMP");
-       }
+       col_set_str(pinfo->cinfo, COL_INFO, "PKIXCMP");
 
        if(parent_tree){
                item=proto_tree_add_item(parent_tree, proto_cmp, tvb, 0, -1, FALSE);
@@ -1679,9 +1677,7 @@ dissect_cmp_http(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "CMP");
 
-       if (check_col(pinfo->cinfo, COL_INFO)) {
-               col_set_str(pinfo->cinfo, COL_INFO, "PKIXCMP");
-       }
+       col_set_str(pinfo->cinfo, COL_INFO, "PKIXCMP");
 
        if(parent_tree){
                item=proto_tree_add_item(parent_tree, proto_cmp, tvb, 0, -1, FALSE);
index 74e71c6811a396a20c71f4bbf8151884c382236b..0feb122c4daf09c46c5f5d1550a518465369bf09 100644 (file)
@@ -1691,9 +1691,7 @@ dissect_contact_header(tvbuff_t *tvb, packet_info *pinfo,
 
     eid_length = evaluate_sdnv(tvb, 8, &sdnv_length);
     if(eid_length < 0) {
-       if(check_col(pinfo->cinfo, COL_INFO)) {
-           col_set_str(pinfo->cinfo, COL_INFO, "Protocol Error (Local EID Length)");
-       }
+       col_set_str(pinfo->cinfo, COL_INFO, "Protocol Error (Local EID Length)");
        return 0;
     }
     proto_tree_add_text(conv_tree, tvb, 8, sdnv_length,
index a0049cdf35f8f06981fdde8c50a79eb9ef8ce331..019a55fb3096a56db6b6068607b2975ae1aeca9d 100644 (file)
@@ -727,9 +727,7 @@ static void dissect_homeplug_loader(ptvcursor_t * cursor, packet_info * pinfo)
 
        switch(mid) {
        case HOMEPLUG_MID_LGDFV:
-               if (check_col(pinfo->cinfo, COL_INFO)) {
-                       col_set_str(pinfo->cinfo, COL_INFO, "Loader Get Firmware Version");
-               }
+               col_set_str(pinfo->cinfo, COL_INFO, "Loader Get Firmware Version");
                ptvcursor_add(cursor, hf_homeplug_loader_gdfv, 1, FALSE);
                ptvcursor_add(cursor, hf_homeplug_loader_length, 2, FALSE);
                if (length != 0) {
@@ -738,16 +736,12 @@ static void dissect_homeplug_loader(ptvcursor_t * cursor, packet_info * pinfo)
                }
                break;
        case HOMEPLUG_MID_LSF:
-               if (check_col(pinfo->cinfo, COL_INFO)) {
-                       col_set_str(pinfo->cinfo, COL_INFO, "Loader Start Firmware");
-               }
+               col_set_str(pinfo->cinfo, COL_INFO, "Loader Start Firmware");
                ptvcursor_add(cursor, hf_homeplug_loader_lsf, 1, FALSE);
                ptvcursor_add(cursor, hf_homeplug_loader_length, 2, FALSE);
                break;
        case HOMEPLUG_MID_LWM:
-               if (check_col(pinfo->cinfo, COL_INFO)) {
-                       col_set_str(pinfo->cinfo, COL_INFO, "Loader Write Memory");
-               }
+               col_set_str(pinfo->cinfo, COL_INFO, "Loader Write Memory");
                ptvcursor_add(cursor, hf_homeplug_loader_lwm, 1, FALSE);
                ptvcursor_add(cursor, hf_homeplug_loader_length, 2, FALSE);
                if (length == 7)
@@ -761,9 +755,7 @@ static void dissect_homeplug_loader(ptvcursor_t * cursor, packet_info * pinfo)
                        ptvcursor_add(cursor, hf_homeplug_loader_data, dlen, FALSE);
                break;
        case HOMEPLUG_MID_LRM:
-               if (check_col(pinfo->cinfo, COL_INFO)) {
-                       col_set_str(pinfo->cinfo, COL_INFO, "Loader Read Memory");
-               }
+               col_set_str(pinfo->cinfo, COL_INFO, "Loader Read Memory");
                ptvcursor_add(cursor, hf_homeplug_loader_lrm, 1, FALSE);
                ptvcursor_add(cursor, hf_homeplug_loader_length, 2, FALSE);
                if (length != 6)
@@ -776,9 +768,7 @@ static void dissect_homeplug_loader(ptvcursor_t * cursor, packet_info * pinfo)
                        ptvcursor_add(cursor, hf_homeplug_loader_data, dlen, FALSE);
                break;
        case HOMEPLUG_MID_LRNVM:
-               if (check_col(pinfo->cinfo, COL_INFO)) {
-                       col_set_str(pinfo->cinfo, COL_INFO, "Loader Read NVM");
-               }
+               col_set_str(pinfo->cinfo, COL_INFO, "Loader Read NVM");
                ptvcursor_add(cursor, hf_homeplug_loader_lrnvm, 1, FALSE);
                ptvcursor_add(cursor, hf_homeplug_loader_length, 2, FALSE);
                if (length != 7)
@@ -791,9 +781,7 @@ static void dissect_homeplug_loader(ptvcursor_t * cursor, packet_info * pinfo)
                        ptvcursor_add(cursor, hf_homeplug_loader_data, dlen, FALSE);
                break;
        case HOMEPLUG_MID_LWNVM:
-               if (check_col(pinfo->cinfo, COL_INFO)) {
-                       col_set_str(pinfo->cinfo, COL_INFO, "Loader Write NVM");
-               }
+               col_set_str(pinfo->cinfo, COL_INFO, "Loader Write NVM");
                ptvcursor_add(cursor, hf_homeplug_loader_lwnvm, 1, FALSE);
                ptvcursor_add(cursor, hf_homeplug_loader_length, 2, FALSE);
                if (length == 7)
@@ -806,16 +794,12 @@ static void dissect_homeplug_loader(ptvcursor_t * cursor, packet_info * pinfo)
                        ptvcursor_add(cursor, hf_homeplug_loader_data, dlen, FALSE);
                break;
        case HOMEPLUG_MID_LRESET:
-               if (check_col(pinfo->cinfo, COL_INFO)) {
-                       col_set_str(pinfo->cinfo, COL_INFO, "Loader Reset");
-               }
+               col_set_str(pinfo->cinfo, COL_INFO, "Loader Reset");
                ptvcursor_add(cursor, hf_homeplug_loader_lreset, 1, FALSE);
                ptvcursor_add(cursor, hf_homeplug_loader_length, 2, FALSE);
                break;
        case HOMEPLUG_MID_GMD:
-               if (check_col(pinfo->cinfo, COL_INFO)) {
-                       col_set_str(pinfo->cinfo, COL_INFO, "Loader Get Module Data");
-               }
+               col_set_str(pinfo->cinfo, COL_INFO, "Loader Get Module Data");
                ptvcursor_add(cursor, hf_homeplug_loader_gmd, 1, FALSE);
                ptvcursor_add(cursor, hf_homeplug_loader_length, 2, FALSE);
                if (length != 10)
@@ -830,9 +814,7 @@ static void dissect_homeplug_loader(ptvcursor_t * cursor, packet_info * pinfo)
                }
                break;
        case HOMEPLUG_MID_SMD:
-               if (check_col(pinfo->cinfo, COL_INFO)) {
-                       col_set_str(pinfo->cinfo, COL_INFO, "Loader Set Module Data");
-               }
+               col_set_str(pinfo->cinfo, COL_INFO, "Loader Set Module Data");
                ptvcursor_add(cursor, hf_homeplug_loader_smd, 1, FALSE);
                ptvcursor_add(cursor, hf_homeplug_loader_length, 2, FALSE);
                if (length == 13)
@@ -848,9 +830,7 @@ static void dissect_homeplug_loader(ptvcursor_t * cursor, packet_info * pinfo)
                        ptvcursor_add(cursor, hf_homeplug_loader_module_size, 4, FALSE);
                break;
        case HOMEPLUG_MID_CM:
-               if (check_col(pinfo->cinfo, COL_INFO)) {
-                       col_set_str(pinfo->cinfo, COL_INFO, "Loader Commit Module");
-               }
+               col_set_str(pinfo->cinfo, COL_INFO, "Loader Commit Module");
                ptvcursor_add(cursor, hf_homeplug_loader_cm, 1, FALSE);
                ptvcursor_add(cursor, hf_homeplug_loader_length, 2, FALSE);
                if (length == 5)
@@ -858,9 +838,7 @@ static void dissect_homeplug_loader(ptvcursor_t * cursor, packet_info * pinfo)
                ptvcursor_add(cursor, hf_homeplug_loader_module_id, 4, FALSE);
                break;
        case HOMEPLUG_MID_LEMD:
-               if (check_col(pinfo->cinfo, COL_INFO)) {
-                       col_set_str(pinfo->cinfo, COL_INFO, "Loader Erase Module Data");
-               }
+               col_set_str(pinfo->cinfo, COL_INFO, "Loader Erase Module Data");
                ptvcursor_add(cursor, hf_homeplug_loader_lemd, 1, FALSE);
                ptvcursor_add(cursor, hf_homeplug_loader_length, 2, FALSE);
                if (length == 9)
@@ -868,9 +846,7 @@ static void dissect_homeplug_loader(ptvcursor_t * cursor, packet_info * pinfo)
                ptvcursor_add(cursor, hf_homeplug_loader_module_id, 4, FALSE);
                break;
        case HOMEPLUG_MID_LENVMS:
-               if (check_col(pinfo->cinfo, COL_INFO)) {
-                       col_set_str(pinfo->cinfo, COL_INFO, "Loader Erase NVM Sectors");
-               }
+               col_set_str(pinfo->cinfo, COL_INFO, "Loader Erase NVM Sectors");
                ptvcursor_add(cursor, hf_homeplug_loader_lenvms, 1, FALSE);
                ptvcursor_add(cursor, hf_homeplug_loader_length, 2, FALSE);
                if (length == 9)
@@ -879,9 +855,7 @@ static void dissect_homeplug_loader(ptvcursor_t * cursor, packet_info * pinfo)
                ptvcursor_add(cursor, hf_homeplug_loader_module_size, 4, FALSE);
                break;
        case HOMEPLUG_MID_GNVMP:
-               if (check_col(pinfo->cinfo, COL_INFO)) {
-                       col_set_str(pinfo->cinfo, COL_INFO, "Loader Get NVM Parametes");
-               }
+               col_set_str(pinfo->cinfo, COL_INFO, "Loader Get NVM Parametes");
                ptvcursor_add(cursor, hf_homeplug_loader_gnvmp, 1, FALSE);
                ptvcursor_add(cursor, hf_homeplug_loader_length, 2, FALSE);
                if (length == 17) {
@@ -893,9 +867,7 @@ static void dissect_homeplug_loader(ptvcursor_t * cursor, packet_info * pinfo)
                }
                break;
        case HOMEPLUG_MID_SNVMP:
-               if (check_col(pinfo->cinfo, COL_INFO)) {
-                       col_set_str(pinfo->cinfo, COL_INFO, "Loader Set NVM Parametes");
-               }
+               col_set_str(pinfo->cinfo, COL_INFO, "Loader Set NVM Parametes");
                ptvcursor_add(cursor, hf_homeplug_loader_snvmp, 1, FALSE);
                ptvcursor_add(cursor, hf_homeplug_loader_length, 2, FALSE);
                if (length == 17)
@@ -932,63 +904,43 @@ static void dissect_homeplug_hreq(ptvcursor_t * cursor, packet_info * pinfo)
 
   switch(mid) {
   case HOMEPLUG_MID_GDV:
-    if (check_col(pinfo->cinfo, COL_INFO)) {
-       col_set_str(pinfo->cinfo, COL_INFO, "Host Request: Get Device Version");
-    }
+    col_set_str(pinfo->cinfo, COL_INFO, "Host Request: Get Device Version");
     ptvcursor_add(cursor, hf_homeplug_hreq_gdv, 1, FALSE);
     break;
   case HOMEPLUG_MID_GFV:
-    if (check_col(pinfo->cinfo, COL_INFO)) {
-       col_set_str(pinfo->cinfo, COL_INFO, "Host Request: Get Firmware Version");
-    }
+    col_set_str(pinfo->cinfo, COL_INFO, "Host Request: Get Firmware Version");
     ptvcursor_add(cursor, hf_homeplug_hreq_gfv, 1, FALSE);
     break;
   case HOMEPLUG_MID_GNEK:
-    if (check_col(pinfo->cinfo, COL_INFO)) {
-       col_set_str(pinfo->cinfo, COL_INFO, "Host Request: Get Network Encryption Key Request");
-    }
+    col_set_str(pinfo->cinfo, COL_INFO, "Host Request: Get Network Encryption Key Request");
     ptvcursor_add(cursor, hf_homeplug_hreq_gnek, 1, FALSE);
     break;
   case HOMEPLUG_MID_GCLBPL:
-    if (check_col(pinfo->cinfo, COL_INFO)) {
-       col_set_str(pinfo->cinfo, COL_INFO, "Host Request: Get/ Clear Local Bridge Proxy List");
-    }
+    col_set_str(pinfo->cinfo, COL_INFO, "Host Request: Get/ Clear Local Bridge Proxy List");
     ptvcursor_add(cursor, hf_homeplug_hreq_gclbpl, 1, FALSE);
     break;
   case HOMEPLUG_MID_NVDS:
-    if (check_col(pinfo->cinfo, COL_INFO)) {
-       col_set_str(pinfo->cinfo, COL_INFO, "Host Request: Non-volatile Database Status");
-    }
+    col_set_str(pinfo->cinfo, COL_INFO, "Host Request: Non-volatile Database Status");
     ptvcursor_add(cursor, hf_homeplug_hreq_nvds, 1, FALSE);
     break;
   case HOMEPLUG_MID_GRBT:
-    if (check_col(pinfo->cinfo, COL_INFO)) {
-       col_set_str(pinfo->cinfo, COL_INFO, "Host Request: Get Remote Bridge Table");
-    }
+    col_set_str(pinfo->cinfo, COL_INFO, "Host Request: Get Remote Bridge Table");
     ptvcursor_add(cursor, hf_homeplug_hreq_grbt, 1, FALSE);
     break;
   case HOMEPLUG_MID_GSLNM:
-    if (check_col(pinfo->cinfo, COL_INFO)) {
-       col_set_str(pinfo->cinfo, COL_INFO, "Host Request: Get/Set Logical Network Mappings");
-    }
+    col_set_str(pinfo->cinfo, COL_INFO, "Host Request: Get/Set Logical Network Mappings");
     ptvcursor_add(cursor, hf_homeplug_hreq_gslnm, 1, FALSE);
     break;
   case HOMEPLUG_MID_GSSS:
-    if (check_col(pinfo->cinfo, COL_INFO)) {
-       col_set_str(pinfo->cinfo, COL_INFO, "Host Request: Get/Set Spectral Scaling");
-    }
+    col_set_str(pinfo->cinfo, COL_INFO, "Host Request: Get/Set Spectral Scaling");
     ptvcursor_add(cursor, hf_homeplug_hreq_gsss, 1, FALSE);
     break;
   case HOMEPLUG_MID_RSL:
-    if (check_col(pinfo->cinfo, COL_INFO)) {
-       col_set_str(pinfo->cinfo, COL_INFO, "Host Request: MAC Reset to Secondary Loader");
-    }
+    col_set_str(pinfo->cinfo, COL_INFO, "Host Request: MAC Reset to Secondary Loader");
     ptvcursor_add(cursor, hf_homeplug_hreq_rsl, 1, FALSE);
     break;
   case HOMEPLUG_MID_RESET:
-    if (check_col(pinfo->cinfo, COL_INFO)) {
-       col_set_str(pinfo->cinfo, COL_INFO, "Host Request: MAC Reset");
-    }
+    col_set_str(pinfo->cinfo, COL_INFO, "Host Request: MAC Reset");
     ptvcursor_add(cursor, hf_homeplug_hreq_reset, 1, FALSE);
     ptvcursor_add(cursor, hf_homeplug_hreq_reset_type, 1, FALSE);
     if (length == 4)
@@ -1018,31 +970,23 @@ static void dissect_homeplug_hrsp(ptvcursor_t * cursor, packet_info * pinfo)
       ptvcursor_current_offset(cursor));
   switch(mid) {
   case HOMEPLUG_MID_GDVR:
-    if (check_col(pinfo->cinfo, COL_INFO)) {
-       col_set_str(pinfo->cinfo, COL_INFO, "Host Response: Get Device Version");
-    }
+    col_set_str(pinfo->cinfo, COL_INFO, "Host Response: Get Device Version");
     ptvcursor_add(cursor, hf_homeplug_hrsp_gdvr, 1, FALSE);
     ptvcursor_add(cursor, hf_homeplug_hrsp_version, -1, FALSE);
     break;
   case HOMEPLUG_MID_GFVR:
-    if (check_col(pinfo->cinfo, COL_INFO)) {
-       col_set_str(pinfo->cinfo, COL_INFO, "Host Response: Get Firmware Version");
-    }
+    col_set_str(pinfo->cinfo, COL_INFO, "Host Response: Get Firmware Version");
     ptvcursor_add(cursor, hf_homeplug_hrsp_gfvr, 1, FALSE);
     ptvcursor_add(cursor, hf_homeplug_hrsp_version, -1, FALSE);
     break;
   case HOMEPLUG_MID_GNEKR:
-    if (check_col(pinfo->cinfo, COL_INFO)) {
-       col_set_str(pinfo->cinfo, COL_INFO, "Get Network Encryption Key");
-    }
+    col_set_str(pinfo->cinfo, COL_INFO, "Get Network Encryption Key");
     ptvcursor_add(cursor, hf_homeplug_hrsp_gnekr, 1, FALSE);
     ptvcursor_add(cursor, hf_homeplug_hrsp_gnekr_select, 1, FALSE);
     ptvcursor_add(cursor, hf_homeplug_hrsp_gnekr_key, 8, FALSE);
     break;
   case HOMEPLUG_MID_INVALID:
-    if (check_col(pinfo->cinfo, COL_INFO)) {
-       col_set_str(pinfo->cinfo, COL_INFO, "Host Response: Invalid MME");
-    }
+    col_set_str(pinfo->cinfo, COL_INFO, "Host Response: Invalid MME");
     ptvcursor_add(cursor, hf_homeplug_hrsp_invalid, 1, FALSE);
     break;
   default:
@@ -1278,33 +1222,23 @@ static void dissect_homeplug_mme(ptvcursor_t * cursor, packet_info * pinfo)
       dissect_homeplug_cer(cursor);
       break;
     case HOMEPLUG_MME_VS:
-      if (check_col(pinfo->cinfo, COL_INFO)) {
-       col_set_str(pinfo->cinfo, COL_INFO, "Vendor Specific");
-      }
+      col_set_str(pinfo->cinfo, COL_INFO, "Vendor Specific");
       dissect_homeplug_vs(cursor);
       break;
     case HOMEPLUG_MME_RBA:
-      if (check_col(pinfo->cinfo, COL_INFO)) {
-       col_set_str(pinfo->cinfo, COL_INFO, "Replace Bridge Address");
-      }
+      col_set_str(pinfo->cinfo, COL_INFO, "Replace Bridge Address");
       dissect_homeplug_rba(cursor);
       break;
     case HOMEPLUG_MME_SNK:
-      if (check_col(pinfo->cinfo, COL_INFO)) {
-       col_set_str(pinfo->cinfo, COL_INFO, "Set Network Encryption Key");
-      }
+      col_set_str(pinfo->cinfo, COL_INFO, "Set Network Encryption Key");
       dissect_homeplug_snk(cursor);
       break;
     case HOMEPLUG_MME_MWR:
-      if (check_col(pinfo->cinfo, COL_INFO)) {
-       col_set_str(pinfo->cinfo, COL_INFO, "Multicast With Response");
-      }
+      col_set_str(pinfo->cinfo, COL_INFO, "Multicast With Response");
       dissect_homeplug_mwr(cursor);
       break;
     case HOMEPLUG_MME_CNK:
-      if (check_col(pinfo->cinfo, COL_INFO)) {
-       col_set_str(pinfo->cinfo, COL_INFO, "Confirm Network Encryption Key");
-      }
+      col_set_str(pinfo->cinfo, COL_INFO, "Confirm Network Encryption Key");
       dissect_homeplug_cnk(cursor);
       break;
     case HOMEPLUG_MME_RPS:
@@ -1317,27 +1251,19 @@ static void dissect_homeplug_mme(ptvcursor_t * cursor, packet_info * pinfo)
       dissect_homeplug_slp(cursor);
       break;
     case HOMEPLUG_MME_LOADER:
-      if (check_col(pinfo->cinfo, COL_INFO)) {
-       col_set_str(pinfo->cinfo, COL_INFO, "Load Firmware");
-      }
+      col_set_str(pinfo->cinfo, COL_INFO, "Load Firmware");
       dissect_homeplug_loader(cursor, pinfo);
       break;
     case HOMEPLUG_MME_HREQ:
-      if (check_col(pinfo->cinfo, COL_INFO)) {
-       col_set_str(pinfo->cinfo, COL_INFO, "Host Request");
-      }
+      col_set_str(pinfo->cinfo, COL_INFO, "Host Request");
       dissect_homeplug_hreq(cursor, pinfo);
       break;
     case HOMEPLUG_MME_HRSP:
-      if (check_col(pinfo->cinfo, COL_INFO)) {
-       col_set_str(pinfo->cinfo, COL_INFO, "Host Response");
-      }
+      col_set_str(pinfo->cinfo, COL_INFO, "Host Response");
       dissect_homeplug_hrsp(cursor, pinfo);
       break;
     case HOMEPLUG_MME_HTAG:
-      if (check_col(pinfo->cinfo, COL_INFO)) {
-       col_set_str(pinfo->cinfo, COL_INFO, "Host Tag");
-      }
+      col_set_str(pinfo->cinfo, COL_INFO, "Host Tag");
       dissect_homeplug_htag(cursor);
       break;
     case HOMEPLUG_MME_NS:
@@ -1379,9 +1305,7 @@ dissect_homeplug(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "HomePlug");
   /* Clear out stuff in the info column */
-  if (check_col(pinfo->cinfo, COL_INFO)) {
-    col_set_str(pinfo->cinfo, COL_INFO, "MAC Management");
-  }
+  col_set_str(pinfo->cinfo, COL_INFO, "MAC Management");
 
   homeplug_offset = 0;
 
index a53ea2ba9cbb463f238eedfb85f082f84448be18..d56c17e8237c5376445c0fde0c3861cc29ae020c 100644 (file)
@@ -1636,9 +1636,7 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
             /* RFC 4380 
              * 5.2.9. Direct IPv6 Connectivity Test 
              */
-            if (check_col(pinfo->cinfo, COL_PROTOCOL)) {
-                col_set_str(pinfo->cinfo, COL_PROTOCOL, "Teredo");
-            }    
+            col_set_str(pinfo->cinfo, COL_PROTOCOL, "Teredo");    
             col_set_str(pinfo->cinfo, COL_INFO, "Direct IPv6 Connectivity Test");
         } else {   
             if (coltypename && strcmp(coltypename, "Unknown") == 0) {
index 89c828a43efc53d9bc2073325d593d9f2b004c23..402617700a46cecb2023954c3d71bd05a031afc9 100644 (file)
@@ -200,9 +200,7 @@ static void dissect_ipsictl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
       }
     }
   }else{
-    if (check_col(pinfo->cinfo, COL_INFO)) {
-        col_set_str(pinfo->cinfo, COL_INFO, "Initialization");
-    }
+    col_set_str(pinfo->cinfo, COL_INFO, "Initialization");
   }
 
 
index 70cceaa18244006d7cdafd23d3dcb0376890a64d..3d23ff339b39f862bb02235ed8203063cbaf938a 100644 (file)
@@ -483,9 +483,7 @@ is_mpa_fpdu(packet_info *pinfo)
 void
 mpa_packetlist(packet_info *pinfo, gint message_type)
 {
-       if (check_col(pinfo->cinfo, COL_PROTOCOL)) {
-               col_set_str(pinfo->cinfo, COL_PROTOCOL, "MPA");
-       }
+       col_set_str(pinfo->cinfo, COL_PROTOCOL, "MPA");
 
        if (check_col(pinfo->cinfo, COL_INFO)) {
                col_clear(pinfo->cinfo, COL_INFO);
index 7c95225186e7bdf69b15d80b8d987c8b74e58fc2..bfaa7d3ebec05e8e36390736c29d4a36c0bead67 100644 (file)
@@ -490,9 +490,7 @@ dissect_ldss_transfer (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                guint offset = 0;
                gboolean already_dissected = TRUE;
 
-               if (check_col(pinfo->cinfo, COL_INFO)) {
-                       col_set_str(pinfo->cinfo, COL_INFO, "LDSS File Transfer (Requesting file - pull)");
-               }
+               col_set_str(pinfo->cinfo, COL_INFO, "LDSS File Transfer (Requesting file - pull)");
 
                if (highest_num_seen == 0 ||
                    highest_num_seen < pinfo->fd->num) {
@@ -803,16 +801,12 @@ dissect_ldss (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        if (is_broadcast(&pinfo->dl_dst) &&
            pinfo->ipproto == IP_PROTO_UDP) {
 
-               if(check_col(pinfo->cinfo,COL_PROTOCOL)){
-                       col_set_str(pinfo->cinfo, COL_PROTOCOL, "LDSS");
-               }
+               col_set_str(pinfo->cinfo, COL_PROTOCOL, "LDSS");
                return dissect_ldss_broadcast(tvb, pinfo, tree);
        }
        else if (pinfo->ipproto == IP_PROTO_TCP) {
 
-               if(check_col(pinfo->cinfo,COL_PROTOCOL)){
-                       col_set_str(pinfo->cinfo, COL_PROTOCOL, "LDSS");
-               }
+               col_set_str(pinfo->cinfo, COL_PROTOCOL, "LDSS");
                return dissect_ldss_transfer(tvb, pinfo, tree);
        }
        else {
index 035bd81b12c636b6978d53ea552b5de4fc821393..aa0db0ed904cefd8cd018b9e816d6ee20302b674 100644 (file)
@@ -271,10 +271,8 @@ static void dissect_control(tvbuff_t *tvb, packet_info *pinfo,
 
     /* Make entries in Protocol column and Info column on summary display */
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "LWAPP");
-    if (check_col(pinfo->cinfo, COL_INFO)) {
-       col_set_str(pinfo->cinfo, COL_INFO,
+    col_set_str(pinfo->cinfo, COL_INFO,
                     "CNTL ");
-    }
 
     /* Copy our header */
     tvb_memcpy(tvb, (guint8*) &header, offset, sizeof(header));
@@ -333,9 +331,7 @@ static void dissect_lwapp_l3(tvbuff_t *tvb, packet_info *pinfo,
 
     /* Make entries in Protocol column and Info column on summary display */
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "LWAPP-L3");
-    if (check_col(pinfo->cinfo, COL_INFO)) {
-       col_set_str(pinfo->cinfo, COL_INFO, "802.3 Packets over Layer 3");
-    }
+    col_set_str(pinfo->cinfo, COL_INFO, "802.3 Packets over Layer 3");
 
     if (tree) {
        /* create display subtree for the protocol */
@@ -375,10 +371,8 @@ static void dissect_lwapp(tvbuff_t *tvb, packet_info *pinfo,
 
     /* Make entries in Protocol column and Info column on summary display */
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "LWAPP");
-    if (check_col(pinfo->cinfo, COL_INFO)) {
-       col_set_str(pinfo->cinfo, COL_INFO,
+    col_set_str(pinfo->cinfo, COL_INFO,
                     "LWAPP IP or Layer 2");
-    }
 
     /* First, set up our dest mac, if we're a control packet with a
      * dest of port 12223 */
index 0100ee50c861eaa08fdf2db686541e63208f1bcc..baa5fe42b79f36bc316c10a8fcd1f511ccc4dced 100644 (file)
@@ -9188,10 +9188,8 @@ dissect_ncp_reply(tvbuff_t *tvb, packet_info *pinfo,
         expert_item = proto_tree_add_item(ncp_tree, hf_ncp_connection_status, tvb,
             7, 1, FALSE);
         if (conn_stat != 0 && conn_stat != 0x40 ) {
-                if (check_col(pinfo->cinfo, COL_INFO)) {
-                        col_set_str(pinfo->cinfo, COL_INFO,
+                col_set_str(pinfo->cinfo, COL_INFO,
                                    "Error: Bad Connection Status");
-                }
                 if (ncp_echo_err) {
                         expert_add_info_format(pinfo, expert_item,
                                                PI_RESPONSE_CODE, PI_ERROR,
@@ -12055,15 +12053,9 @@ dissect_ping_req(tvbuff_t *tvb, packet_info *pinfo,
                /* Fill in the INFO column. */
                if (ncp_rec)
         {
-               if (check_col(pinfo->cinfo, COL_PROTOCOL))
-               {
-                       col_set_str(pinfo->cinfo, COL_PROTOCOL, "NDS");
-               }
+               col_set_str(pinfo->cinfo, COL_PROTOCOL, "NDS");
 
-               if (check_col(pinfo->cinfo, COL_INFO))
-               {
-                        col_set_str(pinfo->cinfo, COL_INFO, "C Ping for NDS");
-               }
+               col_set_str(pinfo->cinfo, COL_INFO, "C Ping for NDS");
 
         }
                if (!pinfo->fd->flags.visited)
index c4dbb411f36b5a614e4b79c82254f048327d6d65..a5db2f8b0ce48592025179052ba23f1700733f34 100644 (file)
@@ -52,10 +52,7 @@ dissect_ncs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "NCS");
-    if (check_col(pinfo->cinfo, COL_INFO))
-    {
-      col_set_str(pinfo->cinfo, COL_INFO, "Novell Cluster Services Heartbeat");
-    }
+    col_set_str(pinfo->cinfo, COL_INFO, "Novell Cluster Services Heartbeat");
 
     proto_tree_add_item(ncs_tree, hf_panning_id, tvb, 4, 4, FALSE);
     proto_tree_add_item(ncs_tree, hf_incarnation, tvb, 8, 4, FALSE);
index 5b0f1508e7fa4b8979396e4bd6509db17c360661..913c4413cb9addaac6d83851d71e8c50522ae36a 100644 (file)
@@ -158,10 +158,7 @@ dissect_nsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "NSRP");
 
-    if (check_col(pinfo->cinfo, COL_INFO))
-    {
-                       col_set_str(pinfo->cinfo, COL_INFO, "NSRP Protocol");
-               }
+    col_set_str(pinfo->cinfo, COL_INFO, "NSRP Protocol");
 
     if (tree) {
                        ti = proto_tree_add_item(tree, proto_nsrp, tvb, 0, -1, FALSE);
index 0b795ff9235055bb07be84b7e5f26a48428ac993..9108c0a675b76fd41d438b0d8a8f290044fb26d0 100644 (file)
@@ -663,9 +663,7 @@ dissect_ocsp_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "OCSP");
 
-       if (check_col(pinfo->cinfo, COL_INFO)) {
-               col_set_str(pinfo->cinfo, COL_INFO, "Request");
-       }
+       col_set_str(pinfo->cinfo, COL_INFO, "Request");
 
 
        if(parent_tree){
@@ -687,9 +685,7 @@ dissect_ocsp_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "OCSP");
 
-       if (check_col(pinfo->cinfo, COL_INFO)) {
-               col_set_str(pinfo->cinfo, COL_INFO, "Response");
-       }
+       col_set_str(pinfo->cinfo, COL_INFO, "Response");
 
 
        if(parent_tree){
index 69712815d37642402761fa02201d3a6e1e1e92d3..eea0cdd565e0989db7fddca1b5b1380d56ba1fd1 100644 (file)
@@ -130,11 +130,7 @@ dissect_oicq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "OICQ");
 
-       if (check_col(pinfo->cinfo, COL_INFO))
-       {
-               col_set_str(pinfo->cinfo, COL_INFO, "OICQ Protocol ");
-               
-       }
+       col_set_str(pinfo->cinfo, COL_INFO, "OICQ Protocol ");
 
 
        if (tree) {
index 84c7878023ca7a3e1ac222a66e3c632f02f69c53..453445131643f620dae3995369f9c5b61e3c1d68 100644 (file)
@@ -81,9 +81,7 @@ dissect_pcli(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
   tvbuff_t * next_tvb;
 
   /* Set the protocol column */
-  if(check_col(pinfo->cinfo,COL_PROTOCOL)){
-    col_set_str(pinfo->cinfo, COL_PROTOCOL, "PCLI");
-  }
+  col_set_str(pinfo->cinfo, COL_PROTOCOL, "PCLI");
 
   /* Get the CCCID */
   cccid = tvb_get_ntohl(tvb,0);
index 868728881e9f387b6bf97c201c913b00a5c4f0d8..bb64a51de12c1d62c395f4aad496c890ded92de8 100644 (file)
@@ -377,9 +377,7 @@ dissect_timestamp_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "PKIXTSP");
 
-       if (check_col(pinfo->cinfo, COL_INFO)) {
-               col_set_str(pinfo->cinfo, COL_INFO, "Reply");
-       }
+       col_set_str(pinfo->cinfo, COL_INFO, "Reply");
 
 
        if(parent_tree){
@@ -400,9 +398,7 @@ dissect_timestamp_query(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "PKIXTSP");
 
-       if (check_col(pinfo->cinfo, COL_INFO)) {
-               col_set_str(pinfo->cinfo, COL_INFO, "Query");
-       }
+       col_set_str(pinfo->cinfo, COL_INFO, "Query");
 
 
        if(parent_tree){
index cac8650ef56e0ffdfb4f1da2429a45b40a293db3..990ccc1a03026947fb24e09457fbf1d25b1944c9 100644 (file)
@@ -909,9 +909,7 @@ dissect_pkix_crl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 
        col_set_str(pinfo->cinfo, COL_PROTOCOL, "PKIX-CRL");
 
-       if (check_col(pinfo->cinfo, COL_INFO)) {
-               col_set_str(pinfo->cinfo, COL_INFO, "Certificate Revocation List");
-       }
+       col_set_str(pinfo->cinfo, COL_INFO, "Certificate Revocation List");
 
 
        if(parent_tree){
index e752faeba2e54f7c329d046e2e073d8926287ff9..48af43c2e4a2f8f1c72b68c74b7d394b0ab6659a 100644 (file)
@@ -1327,9 +1327,7 @@ static void dissect_zbee_beacon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
     guint32     tx_offset;
 
     /* Add ourself to the protocol column. */
-    if(check_col(pinfo->cinfo, COL_PROTOCOL)){
-        col_set_str(pinfo->cinfo, COL_PROTOCOL, "ZigBee");
-    }
+    col_set_str(pinfo->cinfo, COL_PROTOCOL, "ZigBee");
     /* Create the tree for this beacon. */
     if (tree) {
         beacon_root = proto_tree_add_protocol_format(tree, proto_zbee_nwk, tvb, 0, tvb_length(tvb), "ZigBee Beacon");
index 329bdb34028f3aba9eb2d91969754028f1f685dc..8bff678277c24b5f7c0888097166f31249c77449 100644 (file)
@@ -437,46 +437,34 @@ dissect_zrtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 static void
 dissect_ErrorACK(packet_info *pinfo) {
-  if (check_col(pinfo->cinfo, COL_INFO)) {
-    col_set_str(pinfo->cinfo, COL_INFO, "ErrorACK Packet");
-  }
+  col_set_str(pinfo->cinfo, COL_INFO, "ErrorACK Packet");
 }
 
 static void
 dissect_ClearACK(packet_info *pinfo) {
-  if (check_col(pinfo->cinfo, COL_INFO)) {
-    col_set_str(pinfo->cinfo, COL_INFO, "ClearACK Packet");
-  }
+  col_set_str(pinfo->cinfo, COL_INFO, "ClearACK Packet");
 }
 
 static void
 dissect_RelayACK(packet_info *pinfo) {
-  if (check_col(pinfo->cinfo, COL_INFO)) {
-    col_set_str(pinfo->cinfo, COL_INFO, "RelayACK Packet");
-  }
+  col_set_str(pinfo->cinfo, COL_INFO, "RelayACK Packet");
 }
 
 static void
 dissect_Conf2ACK(packet_info *pinfo) {
-  if (check_col(pinfo->cinfo, COL_INFO)) {
-    col_set_str(pinfo->cinfo, COL_INFO, "Conf2ACK Packet");
-  }
+  col_set_str(pinfo->cinfo, COL_INFO, "Conf2ACK Packet");
 }
 
 static void
 dissect_HelloACK(packet_info *pinfo) {
-  if (check_col(pinfo->cinfo, COL_INFO)) {
-    col_set_str(pinfo->cinfo, COL_INFO, "HelloACK Packet");
-  }
+  col_set_str(pinfo->cinfo, COL_INFO, "HelloACK Packet");
 }
 
 static void
 dissect_Ping(tvbuff_t *tvb, packet_info *pinfo, proto_tree *zrtp_tree) {
   unsigned int data_offset=24;
 
-  if (check_col(pinfo->cinfo, COL_INFO)) {
-    col_set_str(pinfo->cinfo, COL_INFO, "Ping Packet");
-  }
+  col_set_str(pinfo->cinfo, COL_INFO, "Ping Packet");
 
   proto_tree_add_item(zrtp_tree,hf_zrtp_msg_ping_version,tvb,data_offset,4,FALSE);
   proto_tree_add_item(zrtp_tree,hf_zrtp_msg_ping_endpointhash,tvb,data_offset+4,8,FALSE);
@@ -486,9 +474,7 @@ static void
 dissect_PingACK(tvbuff_t *tvb, packet_info *pinfo, proto_tree *zrtp_tree) {
   unsigned int data_offset=24;
 
-  if (check_col(pinfo->cinfo, COL_INFO)) {
-    col_set_str(pinfo->cinfo, COL_INFO, "PingACK Packet");
-  }
+  col_set_str(pinfo->cinfo, COL_INFO, "PingACK Packet");
 
   proto_tree_add_item(zrtp_tree,hf_zrtp_msg_ping_version,tvb,data_offset,4,FALSE);
   proto_tree_add_item(zrtp_tree,hf_zrtp_msg_pingack_endpointhash,tvb,data_offset+4,8,FALSE);
@@ -500,9 +486,7 @@ static void
 dissect_GoClear(tvbuff_t *tvb, packet_info *pinfo, proto_tree *zrtp_tree) {
   unsigned int data_offset=24;
 
-  if (check_col(pinfo->cinfo, COL_INFO)) {
-    col_set_str(pinfo->cinfo, COL_INFO, "GoClear Packet");
-  }
+  col_set_str(pinfo->cinfo, COL_INFO, "GoClear Packet");
 
   proto_tree_add_item(zrtp_tree,hf_zrtp_msg_hmac,tvb,data_offset+0,8,FALSE);
 }
@@ -511,9 +495,7 @@ static void
 dissect_Error(tvbuff_t *tvb, packet_info *pinfo, proto_tree *zrtp_tree) {
   unsigned int data_offset=24;
 
-  if (check_col(pinfo->cinfo, COL_INFO)) {
-    col_set_str(pinfo->cinfo, COL_INFO, "Error Packet");
-  }
+  col_set_str(pinfo->cinfo, COL_INFO, "Error Packet");
 
   proto_tree_add_item(zrtp_tree,hf_zrtp_msg_error,tvb,data_offset,4,FALSE);
 }
@@ -543,9 +525,7 @@ dissect_SASrelay(tvbuff_t *tvb, packet_info *pinfo, proto_tree *zrtp_tree) {
   proto_tree *zrtp_msg_encrypted_tree;
   int linelen;
 
-  if (check_col(pinfo->cinfo, COL_INFO)) {
-    col_set_str(pinfo->cinfo, COL_INFO, "SASrelay Packet");
-  }
+  col_set_str(pinfo->cinfo, COL_INFO, "SASrelay Packet");
 
   proto_tree_add_item(zrtp_tree,hf_zrtp_msg_hmac,tvb,data_offset+0,8,FALSE);
   proto_tree_add_item(zrtp_tree,hf_zrtp_msg_cfb,tvb,data_offset+8,16,FALSE);
@@ -591,9 +571,7 @@ dissect_Commit(tvbuff_t *tvb, packet_info *pinfo, proto_tree *zrtp_tree) {
   */
   unsigned int offset;
 
-  if (check_col(pinfo->cinfo, COL_INFO)) {
-    col_set_str(pinfo->cinfo, COL_INFO, "Commit Packet");
-  }
+  col_set_str(pinfo->cinfo, COL_INFO, "Commit Packet");
 
   proto_tree_add_item(zrtp_tree,hf_zrtp_msg_hash_image,tvb,msg_offset+12,32,FALSE);
   /* ZID */
@@ -664,16 +642,12 @@ dissect_Hello(tvbuff_t *tvb, packet_info *pinfo, proto_tree *zrtp_tree) {
   unsigned char version_str[5];
   proto_tree *tmp_tree;
 
-  if (check_col(pinfo->cinfo, COL_INFO)) {
-    col_set_str(pinfo->cinfo, COL_INFO, "Hello Packet");
-  }
+  col_set_str(pinfo->cinfo, COL_INFO, "Hello Packet");
 
   tvb_memcpy(tvb,version_str,msg_offset+12,4);
   version_str[4]='\0';
   if (check_valid_version(version_str) == NULL){
-    if (check_col(pinfo->cinfo, COL_INFO)) {
-      col_set_str(pinfo->cinfo, COL_INFO, "Unsupported version of ZRTP protocol");
-    }
+    col_set_str(pinfo->cinfo, COL_INFO, "Unsupported version of ZRTP protocol");
   }
   proto_tree_add_item(zrtp_tree,hf_zrtp_msg_version,tvb,msg_offset+12,4,FALSE);
   proto_tree_add_item(zrtp_tree,hf_zrtp_msg_client_id,tvb,msg_offset+16,16,FALSE);
index c67089d1759b6d66e726b1dc5ee48f090090c4ac..278fa87e50a6c45137e217c7e4567de2b0d22206 100644 (file)
@@ -55,10 +55,7 @@ dissect_dccack (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 
   len = tvb_length_remaining (tvb, 0);
 
-  if (check_col (pinfo->cinfo, COL_INFO))
-    {
-      col_set_str(pinfo->cinfo, COL_INFO, "DCC-ACK Message: ");
-    }
+  col_set_str(pinfo->cinfo, COL_INFO, "DCC-ACK Message: ");
 
   if (tree)
     {
index 9e2166b0bdc1fa289e603df8b9a885912810a51a..ba88ed41f3ca2a615fa6663a64d34dbd518920f4 100644 (file)
@@ -265,10 +265,7 @@ dissect_dccreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 
   len = tvb_length_remaining (tvb, 0);
 
-  if (check_col (pinfo->cinfo, COL_INFO))
-    {
-      col_set_str(pinfo->cinfo, COL_INFO, "DCC-REQ Message: ");
-    }
+  col_set_str(pinfo->cinfo, COL_INFO, "DCC-REQ Message: ");
 
   if (tree)
     {
index a0e40cde2bfcffccab1fc11efb93e9921619f448..07bbf4056b7bb94dabed5347e66ba46ea962759f 100644 (file)
@@ -111,10 +111,7 @@ dissect_dccrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 
   len = tvb_length_remaining (tvb, 0);
 
-  if (check_col (pinfo->cinfo, COL_INFO))
-    {
-      col_set_str(pinfo->cinfo, COL_INFO, "DCC-RSP Message: ");
-    }
+  col_set_str(pinfo->cinfo, COL_INFO, "DCC-RSP Message: ");
 
   if (tree)
     {
index ad290649873a5ece47743da0d871daa94ef516c1..987dd026c7611483bd58d344a52f01359d918561 100644 (file)
@@ -513,10 +513,7 @@ dissect_dcd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 
   len = tvb_length_remaining (tvb, 0);
 
-  if (check_col (pinfo->cinfo, COL_INFO))
-    {
-      col_set_str(pinfo->cinfo, COL_INFO, "DCD Message: ");
-    }
+  col_set_str(pinfo->cinfo, COL_INFO, "DCD Message: ");
 
   if (tree)
     {
index 1759d078d2fd2842a94ae71c0c1f6f88b0a4826e..d802fab59916ba9041ff52f08a0c32ce95877c84 100644 (file)
@@ -322,10 +322,7 @@ dissect_mdd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
        
        len = tvb_reported_length_remaining (tvb, 0);
 
-       if (check_col (pinfo->cinfo, COL_INFO))
-       {
-               col_set_str(pinfo->cinfo, COL_INFO, "MDD Message:");
-    }
+       col_set_str(pinfo->cinfo, COL_INFO, "MDD Message:");
 
        if (tree)
        {
index d801a0a563d75d2ca9af227bd009299431fbd323..d3a776a5c29235b167e5a3e9d83d8a6bf4df4655 100644 (file)
@@ -55,10 +55,7 @@ dissect_regreqmp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
        proto_tree *regreqmp_tree;
        tvbuff_t *next_tvb;
 
-       if (check_col (pinfo->cinfo, COL_INFO))
-               {
-               col_set_str(pinfo->cinfo, COL_INFO, "REG-REQ-MP Message:");
-               }
+       col_set_str(pinfo->cinfo, COL_INFO, "REG-REQ-MP Message:");
 
                if (tree)
                {
index 5f63bc01f87e577b8bc1644dd4fcc186903cdd1b..92975ccfd2024aba55a5791d6c74316fc85b5096 100644 (file)
@@ -60,10 +60,7 @@ dissect_regrspmp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
        
        
        
-       if (check_col (pinfo->cinfo, COL_INFO))
-               {
-               col_set_str(pinfo->cinfo, COL_INFO, "REG-RSP-MP Message:");
-               }
+       col_set_str(pinfo->cinfo, COL_INFO, "REG-RSP-MP Message:");
        
                if (tree)
                {
index f6c3f3f771ee6e18caeef375ae807fefa351495b..a0bfc316c56867cd3ac4ff448a4baa2b75b4bc65 100644 (file)
@@ -45,10 +45,7 @@ dissect_sync (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
        proto_item *it;
        proto_tree *sync_tree;
 
-       if (check_col (pinfo->cinfo, COL_INFO))
-       {
        col_set_str(pinfo->cinfo, COL_INFO, "Sync Message:");
-       }
 
        if (tree)
        {