kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 287116 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r287116 | mnicholson | 2010-09-16 14:54:48 -0500 (Thu, 16 Sep 2010) | 22 lines
  
  Merged revisions 287115 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r287115 | mnicholson | 2010-09-16 14:53:41 -0500 (Thu, 16 Sep 2010) | 15 lines
    
    Merged revisions 287114 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r287114 | mnicholson | 2010-09-16 14:52:39 -0500 (Thu, 16 Sep 2010) | 8 lines
      
      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
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@287117 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Nicholson
2010-09-16 19:55:21 +00:00
parent 7c77cebd4e
commit 74e65b7ead
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
main/cdr.c
View File

@@ -402,7 +402,7 @@ int ast_cdr_copy_vars(struct ast_cdr *to_cdr, struct ast_cdr *from_cdr)
int ast_cdr_serialize_variables(struct ast_cdr *cdr, struct ast_str **buf, char delim, char sep, int recur) int ast_cdr_serialize_variables(struct ast_cdr *cdr, struct ast_str **buf, char delim, char sep, int recur)
{ {
struct ast_var_t *variables; struct ast_var_t *variables;
const char *var, *val; const char *var;
char *tmp; char *tmp;
char workspace[256]; char workspace[256];
int total = 0, x = 0, i; int total = 0, x = 0, i;
@@ -414,16 +414,16 @@ int ast_cdr_serialize_variables(struct ast_cdr *cdr, struct ast_str **buf, char
ast_str_append(buf, 0, "\n"); ast_str_append(buf, 0, "\n");
AST_LIST_TRAVERSE(&cdr->varshead, variables, entries) { AST_LIST_TRAVERSE(&cdr->varshead, variables, entries) {
if (variables && if (!(var = ast_var_name(variables))) {
(var = ast_var_name(variables)) && (val = ast_var_value(variables)) && continue;
!ast_strlen_zero(var) && !ast_strlen_zero(val)) { }
if (ast_str_append(buf, 0, "level %d: %s%c%s%c", x, var, delim, val, sep) < 0) {
ast_log(LOG_ERROR, "Data Buffer Size Exceeded!\n"); if (ast_str_append(buf, 0, "level %d: %s%c%s%c", x, var, delim, S_OR(ast_var_value(variables), ""), sep) < 0) {
break; ast_log(LOG_ERROR, "Data Buffer Size Exceeded!\n");
} else
total++;
} else
break; break;
}
total++;
} }
for (i = 0; cdr_readonly_vars[i]; i++) { for (i = 0; cdr_readonly_vars[i]; i++) {