diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2010-01-17 12:19:02 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2010-01-17 12:19:02 +0000 |
| commit | ba8d7bd919a274912588ae363403abc880843697 (patch) | |
| tree | 2af5611d4171706d47b054521c7bc9f236b2a5df /asn1/disp | |
| parent | 0d3840e704c28c370fcec20f216b7f9f97e70283 (diff) | |
Get rid of check_col();
svn path=/trunk/; revision=31544
Diffstat (limited to 'asn1/disp')
| -rw-r--r-- | asn1/disp/disp.cnf | 28 | ||||
| -rw-r--r-- | asn1/disp/packet-disp-template.c | 3 |
2 files changed, 8 insertions, 23 deletions
diff --git a/asn1/disp/disp.cnf b/asn1/disp/disp.cnf index dcf3dde4f2..f55fcbb8b9 100644 --- a/asn1/disp/disp.cnf +++ b/asn1/disp/disp.cnf @@ -39,9 +39,7 @@ ModificationParameter S dop.oid "modify.roleb.2.5.19.1" %(DEFAULT_BODY)s - if (check_col(actx->pinfo->cinfo, COL_INFO)) { - col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", val_to_str(update, disp_T_standard_vals, "standard(%%d")); - } + col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", val_to_str(update, disp_T_standard_vals, "standard(%%d")); #.FN_PARS RefreshInformation VAL_PTR = &update @@ -51,9 +49,7 @@ ModificationParameter S dop.oid "modify.roleb.2.5.19.1" %(DEFAULT_BODY)s - if (check_col(actx->pinfo->cinfo, COL_INFO)) { - col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", val_to_str(update, disp_RefreshInformation_vals, "unknown(%%d)")); - } + col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", val_to_str(update, disp_RefreshInformation_vals, "unknown(%%d)")); #.END @@ -63,9 +59,7 @@ ModificationParameter S dop.oid "modify.roleb.2.5.19.1" %(DEFAULT_BODY)s - if (check_col(actx->pinfo->cinfo, COL_INFO)) { - col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", val_to_str(update, disp_StandardUpdate_vals, "unknown(%%d)")); - } + col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", val_to_str(update, disp_StandardUpdate_vals, "unknown(%%d)")); #.FN_PARS CoordinateShadowUpdateResult VAL_PTR = &update @@ -75,9 +69,7 @@ ModificationParameter S dop.oid "modify.roleb.2.5.19.1" %(DEFAULT_BODY)s - if (check_col(actx->pinfo->cinfo, COL_INFO)) { - col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", val_to_str(update, disp_CoordinateShadowUpdateResult_vals, "unknown(%%d)")); - } + col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", val_to_str(update, disp_CoordinateShadowUpdateResult_vals, "unknown(%%d)")); #.FN_PARS RequestShadowUpdateResult VAL_PTR = &update @@ -87,9 +79,7 @@ ModificationParameter S dop.oid "modify.roleb.2.5.19.1" %(DEFAULT_BODY)s - if (check_col(actx->pinfo->cinfo, COL_INFO)) { - col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", val_to_str(update, disp_RequestShadowUpdateResult_vals, "unknown(%%d)")); - } + col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", val_to_str(update, disp_RequestShadowUpdateResult_vals, "unknown(%%d)")); #.FN_PARS UpdateShadowResult VAL_PTR = &update @@ -99,9 +89,7 @@ ModificationParameter S dop.oid "modify.roleb.2.5.19.1" %(DEFAULT_BODY)s - if (check_col(actx->pinfo->cinfo, COL_INFO)) { - col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", val_to_str(update, disp_UpdateShadowResult_vals, "unknown(%%d)")); - } + col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", val_to_str(update, disp_UpdateShadowResult_vals, "unknown(%%d)")); #.FN_PARS ShadowProblem VAL_PTR = &problem @@ -111,6 +99,4 @@ ModificationParameter S dop.oid "modify.roleb.2.5.19.1" %(DEFAULT_BODY)s - if (check_col(actx->pinfo->cinfo, COL_INFO)) { - col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", val_to_str(problem, disp_ShadowProblem_vals, "ShadowProblem(%%d)")); - } + col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", val_to_str(problem, disp_ShadowProblem_vals, "ShadowProblem(%%d)")); diff --git a/asn1/disp/packet-disp-template.c b/asn1/disp/packet-disp-template.c index c32953c220..d6081a81ff 100644 --- a/asn1/disp/packet-disp-template.c +++ b/asn1/disp/packet-disp-template.c @@ -181,8 +181,7 @@ dissect_disp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) } if(disp_dissector) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_str(pinfo->cinfo, COL_INFO, disp_op_name); + col_set_str(pinfo->cinfo, COL_INFO, disp_op_name); while (tvb_reported_length_remaining(tvb, offset) > 0){ old_offset=offset; |