diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-10-01 13:02:12 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-10-01 13:02:12 +0000 |
| commit | 55371ca87db45d0e7463cfba3e57c3ef3a742d50 (patch) | |
| tree | e1ed70a0860dd1dde47a09b6410bb32f63f164bc /epan/dissectors/packet-dcerpc-nt.c | |
| parent | 233a6cd8b7a0101e49fd33c373023bab24c9bbfa (diff) | |
Remove check_col for all non-generated DCE/RPC dissectors.
svn path=/trunk/; revision=52310
Diffstat (limited to 'epan/dissectors/packet-dcerpc-nt.c')
| -rw-r--r-- | epan/dissectors/packet-dcerpc-nt.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/epan/dissectors/packet-dcerpc-nt.c b/epan/dissectors/packet-dcerpc-nt.c index 65b9ba6b7f..49a15fd12d 100644 --- a/epan/dissectors/packet-dcerpc-nt.c +++ b/epan/dissectors/packet-dcerpc-nt.c @@ -357,8 +357,7 @@ static void cb_byte_array_postprocess(packet_info *pinfo, proto_tree *tree _U_, /* Append string to COL_INFO */ if (options & CB_STR_COL_INFO) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", s); + col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", s); } /* Append string to upper-level proto_items */ @@ -940,7 +939,7 @@ dissect_ntstatus(tvbuff_t *tvb, gint offset, packet_info *pinfo, offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hfindex, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", val_to_str(status, NT_errors, "Unknown error 0x%08x")); @@ -962,7 +961,7 @@ dissect_doserror(tvbuff_t *tvb, gint offset, packet_info *pinfo, offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hfindex, &status); - if (status != 0 && check_col(pinfo->cinfo, COL_INFO)) + if (status != 0) col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", val_to_str(status, DOS_errors, "Unknown error 0x%08x")); @@ -1292,8 +1291,7 @@ void cb_wstr_postprocess(packet_info *pinfo, proto_tree *tree _U_, /* Append string to COL_INFO */ if (options & CB_STR_COL_INFO) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", s); + col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", s); } /* Append string to upper-level proto_items */ @@ -1354,8 +1352,7 @@ void cb_str_postprocess(packet_info *pinfo, proto_tree *tree _U_, /* Append string to COL_INFO */ if (options & CB_STR_COL_INFO) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", s); + col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", s); } /* Append string to upper-level proto_items */ @@ -1473,8 +1470,7 @@ dissect_ndr_nt_SID_with_options(tvbuff_t *tvb, int offset, packet_info *pinfo, p while we just do a conformance run, this might have sideeffects so it needs some more thoughts first. */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", s); + col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", s); } /* Append string to upper-level proto_items */ |