diff options
author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-04-06 16:13:09 +0000 |
---|---|---|
committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-04-06 16:13:09 +0000 |
commit | 7db5f594aa9f4482c55de65e5c633b9c2f203a55 (patch) | |
tree | ee49239d686d336c57a2afa926b02bc432053acb /plugins | |
parent | 392caa67a16e945968f055a81fa018c14180c16e (diff) |
Get rid of check_col
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32401 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/profinet/packet-dcom-cba.c | 174 | ||||
-rw-r--r-- | plugins/profinet/packet-pn-ptcp.c | 33 | ||||
-rw-r--r-- | plugins/profinet/packet-pn-rt.c | 3 | ||||
-rw-r--r-- | plugins/profinet/packet-pn.c | 3 | ||||
-rw-r--r-- | plugins/sercosiii/packet-sercosiii_1v1.c | 5 | ||||
-rw-r--r-- | plugins/sercosiii/packet-sercosiii_1v1_at.c | 19 | ||||
-rw-r--r-- | plugins/sercosiii/packet-sercosiii_1v1_mdt.c | 19 | ||||
-rw-r--r-- | plugins/unistim/packet-unistim.c | 15 | ||||
-rw-r--r-- | plugins/wimaxasncp/packet-wimaxasncp.c | 38 |
9 files changed, 113 insertions, 196 deletions
diff --git a/plugins/profinet/packet-dcom-cba.c b/plugins/profinet/packet-dcom-cba.c index 0281ebb707..5c931db260 100644 --- a/plugins/profinet/packet-dcom-cba.c +++ b/plugins/profinet/packet-dcom-cba.c @@ -230,12 +230,10 @@ dissect_ICBABrowse_get_Count_resp(tvbuff_t *tvb, int offset, &u32HResult); if (u32HResult) { /* !S_OK */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, "-> %s", + col_append_fstr(pinfo->cinfo, COL_INFO, "-> %s", val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)") ); } else { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, " Cnt=%u -> S_OK", u32Count); + col_append_fstr(pinfo->cinfo, COL_INFO, " Cnt=%u -> S_OK", u32Count); } @@ -258,9 +256,8 @@ dissect_ICBABrowse_BrowseItems_rqst(tvbuff_t *tvb, int offset, offset = dissect_dcom_DWORD(tvb, offset, pinfo, tree, drep, hf_cba_browse_max_return, &u32MaxReturn); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, " Offset=%u MaxReturn=%u", - u32Offset, u32MaxReturn); + col_append_fstr(pinfo->cinfo, COL_INFO, " Offset=%u MaxReturn=%u", + u32Offset, u32MaxReturn); return offset; } @@ -297,8 +294,7 @@ dissect_ICBABrowse_BrowseItems_resp(tvbuff_t *tvb, int offset, offset = dissect_dcom_HRESULT(tvb, offset, pinfo, tree, drep, &u32HResult); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", + col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)") ); return offset; @@ -317,9 +313,8 @@ dissect_ICBABrowse2_get_Count2_rqst(tvbuff_t *tvb, int offset, offset = dissect_dcom_DWORD(tvb, offset, pinfo, tree, drep, hf_cba_browse_selector, &u32Selector); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, " Selector=%u", - u32Selector); + col_append_fstr(pinfo->cinfo, COL_INFO, " Selector=%u", + u32Selector); return offset; } @@ -344,9 +339,8 @@ dissect_ICBABrowse2_BrowseItems2_rqst(tvbuff_t *tvb, int offset, offset = dissect_dcom_DWORD(tvb, offset, pinfo, tree, drep, hf_cba_browse_max_return, &u32MaxReturn); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, " Sel=%u Offset=%u MaxReturn=%u", - u32Selector, u32Offset, u32MaxReturn); + col_append_fstr(pinfo->cinfo, COL_INFO, " Sel=%u Offset=%u MaxReturn=%u", + u32Selector, u32Offset, u32MaxReturn); return offset; } @@ -383,8 +377,7 @@ dissect_ICBABrowse2_BrowseItems2_resp(tvbuff_t *tvb, int offset, offset = dissect_dcom_HRESULT(tvb, offset, pinfo, tree, drep, &u32HResult); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", + col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)") ); return offset; @@ -416,8 +409,7 @@ dissect_ICBAPersist2_Save2_resp(tvbuff_t *tvb, int offset, offset = dissect_dcom_HRESULT(tvb, offset, pinfo, tree, drep, &u32HResult); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", + col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)") ); return offset; @@ -447,10 +439,8 @@ dissect_get_BSTR_resp(tvbuff_t *tvb, int offset, offset = dissect_dcom_HRESULT(tvb, offset, pinfo, tree, drep, &u32HResult); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, ": \"%s\" -> %s", szStr, - val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)") ); - } + col_append_fstr(pinfo->cinfo, COL_INFO, ": \"%s\" -> %s", szStr, + val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)") ); return offset; } @@ -472,11 +462,9 @@ dissect_get_ProductionDate_resp(tvbuff_t *tvb, int offset, offset = dissect_dcom_HRESULT(tvb, offset, pinfo, tree, drep, &u32HResult); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, ": Date: %g -> %s", - r8Date, - val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)") ); - } + col_append_fstr(pinfo->cinfo, COL_INFO, ": Date: %g -> %s", + r8Date, + val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)") ); return offset; } @@ -502,10 +490,8 @@ dissect_get_SerialNo_resp(tvbuff_t *tvb, int offset, offset = dissect_dcom_HRESULT(tvb, offset, pinfo, tree, drep, &u32HResult); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", - val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)") ); - } + col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", + val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)") ); return offset; } @@ -527,11 +513,9 @@ dissect_ICBATime_get_Time_resp(tvbuff_t *tvb, int offset, offset = dissect_dcom_HRESULT(tvb, offset, pinfo, tree, drep, &u32HResult); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, ": Time: %g -> %s", - r8Date, - val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)") ); - } + col_append_fstr(pinfo->cinfo, COL_INFO, ": Time: %g -> %s", + r8Date, + val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)") ); return offset; } @@ -596,9 +580,7 @@ dissect_ICBAPhysicalDevice_get_LogicalDevice_rqst(tvbuff_t *tvb, int offset, info->call_data->private_data = call; } - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, ": \"%s\"", szStr); - } + col_append_fstr(pinfo->cinfo, COL_INFO, ": \"%s\"", szStr); return offset; } @@ -638,8 +620,7 @@ dissect_ICBAPhysicalDevice_get_LogicalDevice_resp(tvbuff_t *tvb, int offset, offset = dissect_dcom_HRESULT(tvb, offset, pinfo, tree, drep, &u32HResult); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", + col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)") ); return offset; @@ -666,8 +647,7 @@ dissect_ICBAPhysicalDevice2_Type_resp(tvbuff_t *tvb, int offset, offset = dissect_dcom_HRESULT(tvb, offset, pinfo, tree, drep, &u32HResult); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, " App=%s Stack=%s -> %s", + col_append_fstr(pinfo->cinfo, COL_INFO, " App=%s Stack=%s -> %s", (u16MultiApp) ? "Multi" : "Single", (u16PROFInetDCOMStack) ? "PN-DCOM" : "MS-DCOM", val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)") ); @@ -701,8 +681,7 @@ dissect_PROFInetRevision_resp(tvbuff_t *tvb, int offset, offset = dissect_dcom_HRESULT(tvb, offset, pinfo, tree, drep, &u32HResult); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, " Revision=%u.%u.%u.%u -> %s", + col_append_fstr(pinfo->cinfo, COL_INFO, " Revision=%u.%u.%u.%u -> %s", u16Major, u16Minor, u16ServicePack, u16Build, val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)") ); @@ -726,8 +705,7 @@ dissect_ICBAPhysicalDevice2_get_PDevStamp_resp(tvbuff_t *tvb, int offset, offset = dissect_dcom_HRESULT(tvb, offset, pinfo, tree, drep, &u32HResult); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, " PDevStamp=0x%x -> %s", + col_append_fstr(pinfo->cinfo, COL_INFO, " PDevStamp=0x%x -> %s", u32PDevStamp, val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)") ); @@ -755,11 +733,9 @@ dissect_Revision_resp(tvbuff_t *tvb, int offset, offset = dissect_dcom_HRESULT(tvb, offset, pinfo, tree, drep, &u32HResult); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, ": %u.%u -> %s", - u16Major, u16Minor, - val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)") ); - } + col_append_fstr(pinfo->cinfo, COL_INFO, ": %u.%u -> %s", + u16Major, u16Minor, + val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)") ); return offset; } @@ -787,10 +763,8 @@ dissect_ICBALogicalDevice_get_Name_resp(tvbuff_t *tvb, int offset, offset = dissect_dcom_HRESULT(tvb, offset, pinfo, tree, drep, &u32HResult); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, ": \"%s\" -> %s", szStr, - val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)") ); - } + col_append_fstr(pinfo->cinfo, COL_INFO, ": \"%s\" -> %s", szStr, + val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)") ); return offset; } @@ -832,10 +806,8 @@ dissect_ICBALogicalDevice_get_ACCO_resp(tvbuff_t *tvb, int offset, offset = dissect_dcom_HRESULT(tvb, offset, pinfo, tree, drep, &u32HResult); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", + col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)") ); - } return offset; } @@ -854,10 +826,8 @@ dissect_ICBALogicalDevice_get_RTAuto_resp(tvbuff_t *tvb, int offset, offset = dissect_dcom_HRESULT(tvb, offset, pinfo, tree, drep, &u32HResult); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", + col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)") ); - } return offset; } @@ -881,9 +851,7 @@ dissect_ICBALogicalDevice_Get_RTAuto_rqst(tvbuff_t *tvb, int offset, hf_cba_name, szStr, u32MaxStr); } - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, ": \"%s\"", szStr); - } + col_append_fstr(pinfo->cinfo, COL_INFO, ": \"%s\"", szStr); return offset; } @@ -920,11 +888,9 @@ dissect_ComponentInfo_resp(tvbuff_t *tvb, int offset, offset = dissect_dcom_HRESULT(tvb, offset, pinfo, tree, drep, &u32HResult); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, ": ID=\"%s\" Version=\"%s\" -> %s", + col_append_fstr(pinfo->cinfo, COL_INFO, ": ID=\"%s\" Version=\"%s\" -> %s", szStr, szStr2, val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)") ); - } return offset; } @@ -951,11 +917,9 @@ dissect_PBAddressInfo(tvbuff_t *tvb, gint offset, packet_info *pinfo, hf_cba_pbaddress_address, &u8Addr); u32ArraySize-=2; - proto_item_append_text(sub_item, ": ID=0x%x Addr=%u", u8ID, u8Addr); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, ", ID=0x%x Addr=%u", - u8ID, u8Addr); - } + proto_item_append_text(sub_item, ": ID=0x%x Addr=%u", u8ID, u8Addr); + col_append_fstr(pinfo->cinfo, COL_INFO, ", ID=0x%x Addr=%u", + u8ID, u8Addr); } } @@ -972,10 +936,8 @@ dissect_PBAddressInfo_resp(tvbuff_t *tvb, int offset, offset = dissect_dcom_HRESULT(tvb, offset, pinfo, tree, drep, &u32HResult); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", - val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)") ); - } + col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", + val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)") ); return offset; } @@ -1011,11 +973,9 @@ dissect_Advise_resp(tvbuff_t *tvb, int offset, offset = dissect_dcom_HRESULT(tvb, offset, pinfo, tree, drep, &u32HResult); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, ": Cookie=0x%x -> %s", - u32Cookie, - val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)") ); - } + col_append_fstr(pinfo->cinfo, COL_INFO, ": Cookie=0x%x -> %s", + u32Cookie, + val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)") ); return offset; } @@ -1033,10 +993,8 @@ dissect_Unadvise_rqst(tvbuff_t *tvb, int offset, offset = dissect_dcom_DWORD(tvb, offset, pinfo, tree, drep, hf_cba_cookie, &u32Cookie); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, ": Cookie=0x%x", - u32Cookie); - } + col_append_fstr(pinfo->cinfo, COL_INFO, ": Cookie=0x%x", + u32Cookie); return offset; } @@ -1058,11 +1016,9 @@ dissect_ICBAState_get_State_resp(tvbuff_t *tvb, int offset, offset = dissect_dcom_HRESULT(tvb, offset, pinfo, tree, drep, &u32HResult); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, ": State=%s -> %s", - val_to_str(u16State, cba_state_vals, "Unknown (0x%08x)"), - val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)") ); - } + col_append_fstr(pinfo->cinfo, COL_INFO, ": State=%s -> %s", + val_to_str(u16State, cba_state_vals, "Unknown (0x%08x)"), + val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)") ); return offset; } @@ -1084,11 +1040,9 @@ dissect_ICBAStateEvent_OnStateChanged_rqst(tvbuff_t *tvb, int offset, offset = dissect_dcom_WORD(tvb, offset, pinfo, tree, drep, hf_cba_old_state, &u16OldState); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, ": NewState=%s OldState=%s", - val_to_str(u16NewState, cba_state_vals, "Unknown (0x%04x)"), - val_to_str(u16OldState, cba_state_vals, "Unknown (0x%04x)") ); - } + col_append_fstr(pinfo->cinfo, COL_INFO, ": NewState=%s OldState=%s", + val_to_str(u16NewState, cba_state_vals, "Unknown (0x%04x)"), + val_to_str(u16OldState, cba_state_vals, "Unknown (0x%04x)") ); return offset; } @@ -1110,11 +1064,9 @@ dissect_ICBAGroupError_OnGroupErrorChanged_rqst(tvbuff_t *tvb, int offset, offset = dissect_dcom_WORD(tvb, offset, pinfo, tree, drep, hf_cba_old_grouperror, &u16OldGroupError); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, ": NewGE=%s OldGE=%s", - val_to_str(u16NewGroupError, cba_grouperror_vals, "Unknown (0x%04x)"), - val_to_str(u16OldGroupError, cba_grouperror_vals, "Unknown (0x%04x)") ); - } + col_append_fstr(pinfo->cinfo, COL_INFO, ": NewGE=%s OldGE=%s", + val_to_str(u16NewGroupError, cba_grouperror_vals, "Unknown (0x%04x)"), + val_to_str(u16OldGroupError, cba_grouperror_vals, "Unknown (0x%04x)") ); return offset; } @@ -1138,11 +1090,9 @@ dissect_ICBAPhysicalDevicePCEvent_OnLogicalDeviceAdded_rqst(tvbuff_t *tvb, int o offset = dissect_dcom_HRESULT(tvb, offset, pinfo, tree, drep, &u32HResult); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, ": Cookie=0x%x %s", - u32Cookie, - val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)") ); - } + col_append_fstr(pinfo->cinfo, COL_INFO, ": Cookie=0x%x %s", + u32Cookie, + val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)") ); return offset; } @@ -1168,12 +1118,10 @@ dissect_ICBAGroupError_GroupError_resp(tvbuff_t *tvb, int offset, offset = dissect_dcom_HRESULT(tvb, offset, pinfo, tree, drep, &u32HResult); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, ": GroupError=%s Cookie=0x%x -> %s", - val_to_str(u16GroupError, cba_grouperror_vals, "Unknown (0x%08x)"), - u32Cookie, - val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)") ); - } + col_append_fstr(pinfo->cinfo, COL_INFO, ": GroupError=%s Cookie=0x%x -> %s", + val_to_str(u16GroupError, cba_grouperror_vals, "Unknown (0x%08x)"), + u32Cookie, + val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)") ); return offset; } diff --git a/plugins/profinet/packet-pn-ptcp.c b/plugins/profinet/packet-pn-ptcp.c index e4bba79510..579538ecd5 100644 --- a/plugins/profinet/packet-pn-ptcp.c +++ b/plugins/profinet/packet-pn-ptcp.c @@ -208,8 +208,7 @@ dissect_PNPTCP_Subdomain(tvbuff_t *tvb, int offset, offset = dissect_pn_uuid(tvb, offset, pinfo, tree, hf_pn_ptcp_subdomain_uuid, &uuid); if(u16FrameID == 0xff00 || u16FrameID == 0xff01) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, ", Master=%02x:%02x:%02x:%02x:%02x:%02x", + col_append_fstr(pinfo->cinfo, COL_INFO, ", Master=%02x:%02x:%02x:%02x:%02x:%02x", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); } @@ -248,8 +247,7 @@ dissect_PNPTCP_Time(tvbuff_t *tvb, int offset, proto_item_append_text(item, ": Seconds=%u NanoSeconds=%u EpochNumber=%u", Seconds, NanoSeconds, EpochNumber); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, ", Time: %4us %09uns, Epoch: %u", + col_append_fstr(pinfo->cinfo, COL_INFO, ", Time: %4us %09uns, Epoch: %u", Seconds, NanoSeconds, EpochNumber); return offset; @@ -308,8 +306,7 @@ dissect_PNPTCP_Master(tvbuff_t *tvb, int offset, /* Padding */ offset = dissect_pn_align4(tvb, offset, pinfo, tree); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, ", Prio1=\"%s\"", + col_append_fstr(pinfo->cinfo, COL_INFO, ", Prio1=\"%s\"", val_to_str(MasterPriority1, pn_ptcp_master_prio1_short_vals, "(Reserved: 0x%x)")); proto_item_append_text(item, ": Prio1=\"%s\", Prio2=%s, Clock: Class=\"%s\", Accuracy=%s, Variance=%d", @@ -343,8 +340,7 @@ dissect_PNPTCP_PortParameter(tvbuff_t *tvb, int offset, proto_item_append_text(item, ": T2PortRxDelay=%uns, T3PortTxDelay=%uns", t2portrxdelay, t3porttxdelay); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, ", T2Rx=%uns, T3Tx=%uns", + col_append_fstr(pinfo->cinfo, COL_INFO, ", T2Rx=%uns, T3Tx=%uns", t2portrxdelay, t3porttxdelay); return offset; @@ -368,8 +364,7 @@ dissect_PNPTCP_DelayParameter(tvbuff_t *tvb, int offset, proto_item_append_text(item, ": PortMAC=%02x:%02x:%02x:%02x:%02x:%02x", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, ", PortMAC=%02x:%02x:%02x:%02x:%02x:%02x", + col_append_fstr(pinfo->cinfo, COL_INFO, ", PortMAC=%02x:%02x:%02x:%02x:%02x:%02x", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); return offset; @@ -391,8 +386,7 @@ dissect_PNPTCP_PortTime(tvbuff_t *tvb, int offset, proto_item_append_text(item, ": T2TimeStamp=%uns", t2timestamp); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, ", T2TS=%uns", t2timestamp); + col_append_fstr(pinfo->cinfo, COL_INFO, ", T2TS=%uns", t2timestamp); return offset; } @@ -585,8 +579,7 @@ dissect_PNPTCP_FollowUpPDU(tvbuff_t *tvb, int offset, /* Delay1ns_FUP */ offset = dissect_pn_int32(tvb, offset, pinfo, header_tree, hf_pn_ptcp_delay1ns_fup, &delay1ns_fup); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, "%s, Seq=%3u, Delay=%11dns", name, seq_id, delay1ns_fup); + col_append_fstr(pinfo->cinfo, COL_INFO, "%s, Seq=%3u, Delay=%11dns", name, seq_id, delay1ns_fup); proto_item_append_text(item, "%s: Sequence=%u, Delay=%dns", name_short, seq_id, delay1ns_fup); proto_item_append_text(header_item, ": Sequence=%u, Delay=%dns", seq_id, delay1ns_fup); @@ -645,8 +638,7 @@ dissect_PNPTCP_RTSyncPDU(tvbuff_t *tvb, int offset, delay1ns_64 = ((guint64) delay10ns) * 10 + delay1ns_8 + delay1ns_32; delayms = (guint32) (delay1ns_64 / (1000 * 1000)); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, "%s, Seq=%3u, Delay=%11" G_GINT64_MODIFIER "uns", + col_append_fstr(pinfo->cinfo, COL_INFO, "%s, Seq=%3u, Delay=%11" G_GINT64_MODIFIER "uns", name, seq_id, delay1ns_64); proto_item_append_text(item, "%s: Sequence=%u, Delay=%" G_GINT64_MODIFIER "uns", name_short, seq_id, delay1ns_64); @@ -689,8 +681,7 @@ dissect_PNPTCP_AnnouncePDU(tvbuff_t *tvb, int offset, /* Padding 6 bytes */ offset = dissect_pn_padding(tvb, offset, pinfo, header_tree, 6); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, "%s, Seq=%3u", name, seq_id); + col_append_fstr(pinfo->cinfo, COL_INFO, "%s, Seq=%3u", name, seq_id); proto_item_append_text(item, "%s: Sequence=%u", name_short, seq_id); proto_item_append_text(header_item, ": Sequence=%u", seq_id); @@ -728,8 +719,7 @@ dissect_PNPTCP_DelayPDU(tvbuff_t *tvb, int offset, /* Delay1ns_FUP */ offset = dissect_pn_uint32(tvb, offset, pinfo, header_tree, hf_pn_ptcp_delay1ns, &delay1ns); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, "%s, Seq=%3u, Delay=%11uns", name, seq_id, delay1ns); + col_append_fstr(pinfo->cinfo, COL_INFO, "%s, Seq=%3u, Delay=%11uns", name, seq_id, delay1ns); proto_item_append_text(item, "%s: Sequence=%u, Delay=%uns", name_short, seq_id, delay1ns); proto_item_append_text(header_item, ": Sequence=%u, Delay=%uns", seq_id, delay1ns); @@ -827,8 +817,7 @@ dissect_PNPTCP_Data_heur(tvbuff_t *tvb, default: offset = dissect_pn_undecoded(tvb, offset, pinfo, tree, tvb_length_remaining(tvb, offset)); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, "Reserved FrameID 0x%04x", u16FrameID); + col_append_fstr(pinfo->cinfo, COL_INFO, "Reserved FrameID 0x%04x", u16FrameID); proto_item_append_text(item, "Reserved FrameID 0x%04x", u16FrameID); diff --git a/plugins/profinet/packet-pn-rt.c b/plugins/profinet/packet-pn-rt.c index 97f0b9818f..c21966381e 100644 --- a/plugins/profinet/packet-pn-rt.c +++ b/plugins/profinet/packet-pn-rt.c @@ -672,8 +672,7 @@ dissect_pn_rt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* ask heuristics, if some sub-dissector is interested in this packet payload */ if(!dissector_try_heuristic(heur_subdissector_list, next_tvb, pinfo, tree)) { - /*if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, "Unknown");*/ + /*col_set_str(pinfo->cinfo, COL_INFO, "Unknown");*/ /* Oh, well, we don't know this; dissect it as data. */ dissect_pn_undecoded(next_tvb, 0, pinfo, tree, tvb_length(next_tvb)); diff --git a/plugins/profinet/packet-pn.c b/plugins/profinet/packet-pn.c index 5441050511..876aa6e9d5 100644 --- a/plugins/profinet/packet-pn.c +++ b/plugins/profinet/packet-pn.c @@ -273,8 +273,7 @@ dissect_pn_align4(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree void pn_append_info(packet_info *pinfo, proto_item *dcp_item, const char *text) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, text); + col_append_str(pinfo->cinfo, COL_INFO, text); proto_item_append_text(dcp_item, "%s", text); } diff --git a/plugins/sercosiii/packet-sercosiii_1v1.c b/plugins/sercosiii/packet-sercosiii_1v1.c index c40f2f5afd..fa4288aee5 100644 --- a/plugins/sercosiii/packet-sercosiii_1v1.c +++ b/plugins/sercosiii/packet-sercosiii_1v1.c @@ -69,10 +69,7 @@ dissect_siii(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tel_no = type &0xF; /* even though it's reserved (the V1.1 spec states that it is reserved for additional MDT/AT) */ - if(check_col(pinfo->cinfo, COL_INFO)) - { - col_append_fstr(pinfo->cinfo, COL_INFO, "%s%u Channel=%s", tel_type, tel_no, tel_ch); - } + col_append_fstr(pinfo->cinfo, COL_INFO, "%s%u Channel=%s", tel_type, tel_no, tel_ch); ti = proto_tree_add_item(tree, proto_siii, tvb, 0, -1, FALSE); diff --git a/plugins/sercosiii/packet-sercosiii_1v1_at.c b/plugins/sercosiii/packet-sercosiii_1v1_at.c index 818454ed2f..bf2050f547 100644 --- a/plugins/sercosiii/packet-sercosiii_1v1_at.c +++ b/plugins/sercosiii/packet-sercosiii_1v1_at.c @@ -143,18 +143,15 @@ void dissect_siii_at(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "SIII AT"); - if(check_col(pinfo->cinfo, COL_INFO)) + if(phase & 0x80) /* communication phase switching in progress */ { - if(phase & 0x80) /* communication phase switching in progress */ - { - col_append_fstr(pinfo->cinfo, COL_INFO, " Phase=CP?s -> CP%u", - (phase&0x0f)); - } - else /* communication as usual */ - { - col_append_fstr(pinfo->cinfo, COL_INFO, " Phase=CP%u", - (phase&0x0f)); - } + col_append_fstr(pinfo->cinfo, COL_INFO, " Phase=CP?s -> CP%u", + (phase&0x0f)); + } + else /* communication as usual */ + { + col_append_fstr(pinfo->cinfo, COL_INFO, " Phase=CP%u", + (phase&0x0f)); } ti = proto_tree_add_text(tree, tvb, 0, -1, "AT%u", telno); diff --git a/plugins/sercosiii/packet-sercosiii_1v1_mdt.c b/plugins/sercosiii/packet-sercosiii_1v1_mdt.c index b8999f940a..5a1ce6d5de 100644 --- a/plugins/sercosiii/packet-sercosiii_1v1_mdt.c +++ b/plugins/sercosiii/packet-sercosiii_1v1_mdt.c @@ -142,18 +142,15 @@ void dissect_siii_mdt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) t_phase = (tvb_get_guint8(tvb, 1)&0x8F); /* read communication phase out of SERCOS III header */ telno = (tvb_get_guint8(tvb, 0) & 0xF); /* read number of MDT out of SERCOS III header */ - if(check_col(pinfo->cinfo, COL_INFO)) + if(t_phase & 0x80) /* communication phase switching in progress */ { - if(t_phase & 0x80) /* communication phase switching in progress */ - { - col_append_fstr(pinfo->cinfo, COL_INFO, " Phase=CP?s -> CP%u", - (t_phase&0x0f)); - } - else /* communication as usual */ - { - col_append_fstr(pinfo->cinfo, COL_INFO, " Phase=CP%u", - (t_phase&0x0f)); - } + col_append_fstr(pinfo->cinfo, COL_INFO, " Phase=CP?s -> CP%u", + (t_phase&0x0f)); + } + else /* communication as usual */ + { + col_append_fstr(pinfo->cinfo, COL_INFO, " Phase=CP%u", + (t_phase&0x0f)); } ti = proto_tree_add_text(tree, tvb, 0, -1, "MDT%u", telno); diff --git a/plugins/unistim/packet-unistim.c b/plugins/unistim/packet-unistim.c index c1264ecead..a7a89fc685 100644 --- a/plugins/unistim/packet-unistim.c +++ b/plugins/unistim/packet-unistim.c @@ -235,20 +235,17 @@ dissect_unistim(tvbuff_t *tvb,packet_info *pinfo,proto_tree *tree){ switch(tvb_get_guint8(tvb,offset)) { case 0x00: /*NAK*/ - if (check_col(pinfo->cinfo, COL_INFO)) - col_add_fstr(pinfo->cinfo, COL_INFO, "NAK for seq - 0x%X", - tvb_get_ntohl(tvb, offset-4)); + col_add_fstr(pinfo->cinfo, COL_INFO, "NAK for seq - 0x%X", + tvb_get_ntohl(tvb, offset-4)); break; case 0x01: /*ACK*/ - if (check_col(pinfo->cinfo, COL_INFO)) - col_add_fstr(pinfo->cinfo, COL_INFO, "ACK for seq - 0x%X", - tvb_get_ntohl(tvb, offset-4)); + col_add_fstr(pinfo->cinfo, COL_INFO, "ACK for seq - 0x%X", + tvb_get_ntohl(tvb, offset-4)); break; case 0x02: - if (check_col(pinfo->cinfo, COL_INFO)) - col_add_fstr(pinfo->cinfo, COL_INFO, "Payload seq - 0x%X", - tvb_get_ntohl(tvb, offset-4)); + col_add_fstr(pinfo->cinfo, COL_INFO, "Payload seq - 0x%X", + tvb_get_ntohl(tvb, offset-4)); offset+=1; dissect_payload(overall_unistim_tree,tvb,offset,pinfo); break; diff --git a/plugins/wimaxasncp/packet-wimaxasncp.c b/plugins/wimaxasncp/packet-wimaxasncp.c index cd6a81cf51..ab6e6141c8 100644 --- a/plugins/wimaxasncp/packet-wimaxasncp.c +++ b/plugins/wimaxasncp/packet-wimaxasncp.c @@ -1522,22 +1522,19 @@ static void wimaxasncp_dissect_tlv_value( } /* Add code and type to info column */ - if (check_col(pinfo->cinfo, COL_INFO)) + col_append_str(pinfo->cinfo, COL_INFO, " ["); + col_append_str(pinfo->cinfo, COL_INFO, + val_to_str(eap_code, eap_code_vals, "Unknown code (0x%02X)")); + + if (eap_code == EAP_REQUEST || eap_code == EAP_RESPONSE) { - col_append_str(pinfo->cinfo, COL_INFO, " ["); + col_append_str(pinfo->cinfo, COL_INFO, ", "); col_append_str(pinfo->cinfo, COL_INFO, - val_to_str(eap_code, eap_code_vals, "Unknown code (0x%02X)")); - - if (eap_code == EAP_REQUEST || eap_code == EAP_RESPONSE) - { - col_append_str(pinfo->cinfo, COL_INFO, ", "); - col_append_str(pinfo->cinfo, COL_INFO, - val_to_str(eap_type, eap_type_vals, "Unknown type (0x%02X)")); - } - - col_append_str(pinfo->cinfo, COL_INFO, "]"); + val_to_str(eap_type, eap_type_vals, "Unknown type (0x%02X)")); } + col_append_str(pinfo->cinfo, COL_INFO, "]"); + { proto_tree *eap_tree; @@ -1989,17 +1986,14 @@ static guint dissect_wimaxasncp_backend( offset += dissect_wimaxasncp_tlvs(tlv_tvb, pinfo, tree); } - if (check_col(pinfo->cinfo, COL_INFO)) + col_append_fstr(pinfo->cinfo, COL_INFO, " - MSID:%s", pmsid); + if (dbit_show) { - col_append_fstr(pinfo->cinfo, COL_INFO, " - MSID:%s", pmsid); - if (dbit_show) - { - col_append_fstr(pinfo->cinfo, COL_INFO, ", TID:D+0x%04x", tid); - } - else - { - col_append_fstr(pinfo->cinfo, COL_INFO, ", TID:0x%04x", tid); - } + col_append_fstr(pinfo->cinfo, COL_INFO, ", TID:D+0x%04x", tid); + } + else + { + col_append_fstr(pinfo->cinfo, COL_INFO, ", TID:0x%04x", tid); } return offset; |