kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

use ast_build_string() to build strings into buffers, and general cleanup of variable serializing functions used by 'show channel' (bug #4558)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5944 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-06-20 23:37:01 +00:00
parent ffebf1f71b
commit 11ea6fe59f
2 changed files with 39 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
cdr.c
View File

@@ -324,17 +324,14 @@ int ast_cdr_copy_vars(struct ast_cdr *to_cdr, struct ast_cdr *from_cdr)
return x;
}
#define CDR_CLEN 18
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;
struct varshead *headp;
char *var=NULL ,*val=NULL;
char *tmp = NULL;
char *var, *val;
char *tmp;
char workspace[256];
int workspacelen;
int total = 0, x = 0, i = 0;
const char *cdrcols[CDR_CLEN] = {
int total = 0, x = 0, i;
const char *cdrcols[] = {
"clid",
"src",
"dst",
@@ -355,46 +352,36 @@ int ast_cdr_serialize_variables(struct ast_cdr *cdr, char *buf, size_t size, cha
"userfield"
};
memset(buf, 0, size);
memset(buf,0,size);
while (cdr) {
x++;
if (x > 1) {
strncat(buf, "\n", size);
}
headp = &cdr->varshead;
AST_LIST_TRAVERSE(headp,variables,entries) {
if (cdr && variables &&
for (; cdr; cdr = recur ? cdr->next : NULL) {
if (++x > 1)
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)) {
snprintf(buf + strlen(buf), size - strlen(buf), "level %d: %s%c%s%c", x, var, delim, val, sep);
if (strlen(buf) >= size) {
ast_log(LOG_ERROR,"Data Buffer Size Exceeded!\n");
break;
}
total++;
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
break;
}
for (i = 0 ; i < CDR_CLEN; i++) {
workspacelen = sizeof(workspace);
ast_cdr_getvar(cdr, cdrcols[i], &tmp, workspace, workspacelen, 0);
for (i = 0; i < (sizeof(cdrcols) / sizeof(cdrcols[0])); i++) {
ast_cdr_getvar(cdr, cdrcols[i], &tmp, workspace, sizeof(workspace), 0);
if (!tmp)
continue;
snprintf(buf + strlen(buf), size - strlen(buf), "level %d: %s%c%s%c", x, cdrcols[i], delim, tmp, sep);
if (strlen(buf) >= size) {
ast_log(LOG_ERROR,"Data Buffer Size Exceeded!\n");
if (ast_build_string(&buf, &size, "level %d: %s%c%s%c", x, cdrcols[i], delim, tmp, sep)) {
ast_log(LOG_ERROR, "Data Buffer Size Exceeded!\n");
break;
}
total++;
} else
total++;
}
if (!recur) {
break;
}
cdr = cdr->next;
}
return total;

31
pbx.c
View File

@@ -5667,24 +5667,25 @@ static int pbx_builtin_goto(struct ast_channel *chan, void *data)
int pbx_builtin_serialize_variables(struct ast_channel *chan, char *buf, size_t size)
{
struct ast_var_t *variables;
struct varshead *headp;
char *var=NULL ,*val=NULL;
char *var, *val;
int total = 0;
memset(buf,0,size);
if (chan) {
headp=&chan->varshead;
AST_LIST_TRAVERSE(headp,variables,entries) {
if(chan && variables && (var=ast_var_name(variables)) && (val=ast_var_value(variables)) && !ast_strlen_zero(var) && !ast_strlen_zero(val)) {
snprintf(buf + strlen(buf), size - strlen(buf), "%s=%s\n", var, val);
if(strlen(buf) >= size) {
ast_log(LOG_ERROR,"Data Buffer Size Exceeded!\n");
break;
}
total++;
} else
if (!chan)
return 0;
memset(buf, 0, size);
AST_LIST_TRAVERSE(&chan->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, "%s=%s\n", var, val)) {
ast_log(LOG_ERROR, "Data Buffer Size Exceeded!\n");
break;
}
} else
total++;
} else
break;
}
return total;