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/dap | |
| parent | 0d3840e704c28c370fcec20f216b7f9f97e70283 (diff) | |
Get rid of check_col();
svn path=/trunk/; revision=31544
Diffstat (limited to 'asn1/dap')
| -rw-r--r-- | asn1/dap/dap.cnf | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/asn1/dap/dap.cnf b/asn1/dap/dap.cnf index 46cb3808b9..b69c7124cb 100644 --- a/asn1/dap/dap.cnf +++ b/asn1/dap/dap.cnf @@ -267,8 +267,7 @@ OPERATION.&ResultType %(DEFAULT_BODY)s - if(check_col(actx->pinfo->cinfo, COL_INFO)) - col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", x509if_get_last_dn()); + col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", x509if_get_last_dn()); @@ -306,9 +305,7 @@ OPERATION.&ResultType %(DEFAULT_BODY)s - if (check_col(actx->pinfo->cinfo, COL_INFO)) { - col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", val_to_str(problem, dap_SecurityProblem_vals, "SecurityProblem(%%d)")); - } + col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", val_to_str(problem, dap_SecurityProblem_vals, "SecurityProblem(%%d)")); #.FN_PARS ServiceProblem VAL_PTR = &problem @@ -318,9 +315,7 @@ OPERATION.&ResultType %(DEFAULT_BODY)s - if (check_col(actx->pinfo->cinfo, COL_INFO)) { - col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", val_to_str(problem, dap_ServiceProblem_vals, "ServiceProblem(%%d)")); - } + col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", val_to_str(problem, dap_ServiceProblem_vals, "ServiceProblem(%%d)")); #.FN_PARS UpdateProblem VAL_PTR = &problem @@ -330,9 +325,7 @@ OPERATION.&ResultType %(DEFAULT_BODY)s - if (check_col(actx->pinfo->cinfo, COL_INFO)) { - col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", val_to_str(problem, dap_UpdateProblem_vals, "UpdateProblem(%%d)")); - } + col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", val_to_str(problem, dap_UpdateProblem_vals, "UpdateProblem(%%d)")); #.FN_PARS LimitProblem VAL_PTR = &problem @@ -342,9 +335,7 @@ OPERATION.&ResultType %(DEFAULT_BODY)s - if (check_col(actx->pinfo->cinfo, COL_INFO)) { - col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", val_to_str(problem, dap_LimitProblem_vals, "LimitProblem(%%d)")); - } + col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", val_to_str(problem, dap_LimitProblem_vals, "LimitProblem(%%d)")); #.END @@ -354,9 +345,7 @@ OPERATION.&ResultType %(DEFAULT_BODY)s - if (check_col(actx->pinfo->cinfo, COL_INFO)) { - col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", val_to_str(subset, dap_T_subset_vals, "Subset(%%d)")); - } + col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", val_to_str(subset, dap_T_subset_vals, "Subset(%%d)")); #.FN_BODY Name @@ -364,8 +353,6 @@ OPERATION.&ResultType %(DEFAULT_BODY)s - if(check_col(actx->pinfo->cinfo, COL_INFO)) { - dn = x509if_get_last_dn(); - col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", (dn && *dn) ? dn : "(root)"); - } + dn = x509if_get_last_dn(); + col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", (dn && *dn) ? dn : "(root)"); |