Get rid of check_col();

svn path=/trunk/; revision=31552

1 files changed, 10 insertions, 19 deletions

diff --git a/asn1/ldap/ldap.cnf b/asn1/ldap/ldap.cnf
index ff7a59e444..2c1ae2f89c 100644
--- a/asn1/ldap/ldap.cnf
+++ b/asn1/ldap/ldap.cnf
@@ -72,9 +72,7 @@ PasswordPolicyResponseValue	B "1.3.6.1.4.1.42.2.27.8.5.1"  "passwordPolicy"
 
 		if((hf_index == hf_ldap_requestName) || (hf_index == hf_ldap_responseName)) {
 			ldap_do_protocolop(actx->pinfo);
-
-			if(check_col(actx->pinfo->cinfo, COL_INFO))
-			      col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%s ", name);
+			col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%s ", name);
 		}
 	}
 
@@ -139,8 +137,7 @@ PasswordPolicyResponseValue	B "1.3.6.1.4.1.42.2.27.8.5.1"  "passwordPolicy"
 
     case LDAP_RES_SEARCH_RESULT:
 
-    	if (check_col(actx->pinfo->cinfo, COL_INFO))
-          col_append_fstr(actx->pinfo->cinfo, COL_INFO, " [%d result%s]",
+        col_append_fstr(actx->pinfo->cinfo, COL_INFO, " [%d result%s]",
   	    	        ldap_info->num_results, ldap_info->num_results == 1 ? "" : "s");
 
   	proto_item_append_text(tree, " [%d result%s]",
@@ -342,8 +339,7 @@ ldap_conv_info_t *ldap_info;
 	if(!ldapstring || !*ldapstring)
 	  ldapstring = "<ROOT>";
 
-	if(check_col(actx->pinfo->cinfo, COL_INFO))
-	  col_append_fstr(actx->pinfo->cinfo, COL_INFO, "\"%%s\" ", ldapstring);
+    col_append_fstr(actx->pinfo->cinfo, COL_INFO, "\"%%s\" ", ldapstring);
 
   	if(ldm_tree)
   	  proto_item_append_text(ldm_tree, " \"%%s\"", ldapstring);
@@ -355,8 +351,7 @@ ldap_conv_info_t *ldap_info;
 	}
 
      } else if ((hf_index == hf_ldap_errorMessage) && ldapstring && *ldapstring) { /* only show message if not success */
-	if(check_col(actx->pinfo->cinfo, COL_INFO))
-          col_append_fstr(actx->pinfo->cinfo, COL_INFO, "(%%s) ", ldapstring);
+        col_append_fstr(actx->pinfo->cinfo, COL_INFO, "(%%s) ", ldapstring);
 
         if(ldm_tree)
   	  proto_item_append_text(ldm_tree, " (%%s)", ldapstring);
@@ -370,10 +365,9 @@ ldap_conv_info_t *ldap_info;
 	if(!ldapstring || !*ldapstring)
 	  ldapstring = "<ROOT>";
 
-	if(check_col(actx->pinfo->cinfo, COL_INFO))
-          col_append_fstr(actx->pinfo->cinfo, COL_INFO, "\"%%s\" ", ldapstring);
+    col_append_fstr(actx->pinfo->cinfo, COL_INFO, "\"%%s\" ", ldapstring);
 
-        if(ldm_tree)
+    if(ldm_tree)
   	  proto_item_append_text(ldm_tree, " \"%%s\"", ldapstring);
      } else if (hf_index == hf_ldap_attributeDesc){
 	/* remember the attribute description */
@@ -425,8 +419,7 @@ ldap_conv_info_t *ldap_info;
 
   valstr = val_to_str(scope, ldap_T_scope_vals, "Unknown scope(%%u)");
 
-  if (check_col(actx->pinfo->cinfo, COL_INFO))
-    col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%%s ", valstr);
+  col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%%s ", valstr);
 
   if(ldm_tree)
     proto_item_append_text(ldm_tree, " %%s", valstr);
@@ -441,8 +434,7 @@ ldap_conv_info_t *ldap_info;
 
   valstr = val_to_str(result, ldap_T_resultCode_vals, "Unknown result(%%u)");
 
-  if (check_col(actx->pinfo->cinfo, COL_INFO))
-    col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%%s ", valstr);
+  col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%%s ", valstr);
 
   if(ldm_tree)
     proto_item_append_text(ldm_tree, " %%s", valstr);
@@ -458,8 +450,7 @@ ldap_conv_info_t *ldap_info;
 
   valstr = val_to_str(result, ldap_BindResponse_resultCode_vals, "Unknown result(%%u)");
 
-  if (check_col(actx->pinfo->cinfo, COL_INFO))
-    col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%%s ", valstr);
+  col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%%s ", valstr);
 
   if(ldm_tree)
     proto_item_append_text(ldm_tree, " %%s", valstr);
@@ -513,7 +504,7 @@ ldap_conv_info_t *ldap_info;
   valstr = val_to_str(auth, ldap_AuthenticationChoice_vals, "Unknown auth(%%u)");
 
   /* If auth is NTLM (10 or 11) don't add to column as the NTLM dissection will do this */
-  if (check_col(actx->pinfo->cinfo, COL_INFO) && (auth !=  10) && (auth != 11))
+  if ((auth !=  10) && (auth != 11))
     col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%%s ", valstr);
 
   if(ldm_tree)