[asterisk-commits] mnicholson: branch 1.4 r287114 - /branches/1.4/main/cdr.c

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Thu Sep 16 14:52:39 2010
New Revision: 287114

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=287114
Log:
Don't stop printing cdr variables if we encounter one with a blank name or value.

(closes issue #17900)
Reported by: under
Patches:
      core-show-channel-cdr-fix1.diff uploaded by mnicholson (license 96)
Tested by: mnicholson

Modified:
    branches/1.4/main/cdr.c

Modified: branches/1.4/main/cdr.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/main/cdr.c?view=diff&rev=287114&r1=287113&r2=287114
==============================================================================
--- branches/1.4/main/cdr.c (original)
+++ branches/1.4/main/cdr.c Thu Sep 16 14:52:39 2010
@@ -368,7 +368,7 @@
 int ast_cdr_serialize_variables(struct ast_cdr *cdr, char *buf, size_t size, char delim, char sep, int recur) 
 {
 	struct ast_var_t *variables;
-	const char *var, *val;
+	const char *var;
 	char *tmp;
 	char workspace[256];
 	int total = 0, x = 0, i;
@@ -380,16 +380,16 @@
 			ast_build_string(&buf, &size, "\n");
 
 		AST_LIST_TRAVERSE(&cdr->varshead, variables, entries) {
-			if (variables &&
-			    (var = ast_var_name(variables)) && (val = ast_var_value(variables)) &&
-			    !ast_strlen_zero(var) && !ast_strlen_zero(val)) {
-				if (ast_build_string(&buf, &size, "level %d: %s%c%s%c", x, var, delim, val, sep)) {
- 					ast_log(LOG_ERROR, "Data Buffer Size Exceeded!\n");
- 					break;
-				} else
-					total++;
-			} else 
+			if (!(var = ast_var_name(variables))) {
+				continue;
+			}
+
+			if (ast_build_string(&buf, &size, "level %d: %s%c%s%c", x, var, delim, S_OR(ast_var_value(variables), ""), sep)) {
+				ast_log(LOG_ERROR, "Data Buffer Size Exceeded!\n");
 				break;
+			}
+
+			total++;
 		}
 
 		for (i = 0; cdr_readonly_vars[i]; i++) {