diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2011-09-26 11:33:10 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2011-09-26 11:33:10 +0000 |
| commit | ab901be153637f37698e9501dac9d38b10bf46ec (patch) | |
| tree | 66930c9969eccd09aa135bc6b8c3dde0967ec5ae /epan/dissectors/packet-dcom-oxid.c | |
| parent | fc447d3377db6a9a8e2cc519087f8054e85c143c (diff) | |
Get rid of check_col, while at it set ENC.
svn path=/trunk/; revision=39148
Diffstat (limited to 'epan/dissectors/packet-dcom-oxid.c')
| -rw-r--r-- | epan/dissectors/packet-dcom-oxid.c | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/epan/dissectors/packet-dcom-oxid.c b/epan/dissectors/packet-dcom-oxid.c index 4503b5948a..74758f8f82 100644 --- a/epan/dissectors/packet-dcom-oxid.c +++ b/epan/dissectors/packet-dcom-oxid.c @@ -82,10 +82,8 @@ dissect_oxid_simple_ping_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; } @@ -101,10 +99,8 @@ dissect_oxid_server_alive_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; } @@ -130,10 +126,8 @@ dissect_oxid_complex_ping_rqst(tvbuff_t *tvb, int offset, offset = dissect_dcom_WORD(tvb, offset, pinfo, tree, drep, hf_oxid_delfromset, &u16DelFromSet); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, " AddToSet=%u DelFromSet=%u", + col_append_fstr(pinfo->cinfo, COL_INFO, " AddToSet=%u DelFromSet=%u", u16AddToSet, u16DelFromSet); - } offset = dissect_dcom_dcerpc_pointer(tvb, offset, pinfo, tree, drep, &u32Pointer); @@ -179,10 +173,8 @@ dissect_oxid_complex_ping_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; } @@ -252,10 +244,8 @@ dissect_oxid_resolve_oxid2_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; } |