diff --git a/main/channel.c b/main/channel.c index a386154154930bf0f3bcc3dff6d05768bf93a47d..a44279d2226532ceb4489e365dbb046706c63275 100644 --- a/main/channel.c +++ b/main/channel.c @@ -6346,18 +6346,19 @@ void ast_channel_inherit_variables(const struct ast_channel *parent, struct ast_ newvar = ast_var_assign(&varname[1], ast_var_value(current)); if (newvar) { AST_LIST_INSERT_TAIL(ast_channel_varshead(child), newvar, entries); - ast_debug(1, "Copying soft-transferable variable %s.\n", ast_var_name(newvar)); + ast_debug(1, "Inheriting variable %s from %s to %s.\n", + ast_var_name(newvar), ast_channel_name(parent), ast_channel_name(child)); } break; case 2: newvar = ast_var_assign(varname, ast_var_value(current)); if (newvar) { AST_LIST_INSERT_TAIL(ast_channel_varshead(child), newvar, entries); - ast_debug(1, "Copying hard-transferable variable %s.\n", ast_var_name(newvar)); + ast_debug(1, "Inheriting variable %s from %s to %s.\n", + ast_var_name(newvar), ast_channel_name(parent), ast_channel_name(child)); } break; default: - ast_debug(1, "Not copying variable %s.\n", ast_var_name(current)); break; } } diff --git a/main/pbx.c b/main/pbx.c index 24c34b49f852cbf041f1bfd45dee43b6d1f12c30..5c29a0c4226f5dcf07b30306b89130c0c032d303 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -4323,7 +4323,7 @@ void ast_str_substitute_variables_full(struct ast_str **buf, ssize_t maxlen, str ast_log(LOG_ERROR, "Unable to allocate bogus channel for variable substitution. Function results may be blank.\n"); } } - ast_debug(2, "Function result is '%s'\n", cp4 ? cp4 : "(null)"); + ast_debug(2, "Function %s result is '%s'\n", finalvars, cp4 ? cp4 : "(null)"); } else { /* Retrieve variable value */ ast_str_retrieve_variable(&substr3, 0, c, headp, finalvars); @@ -4523,7 +4523,7 @@ void pbx_substitute_variables_helper_full(struct ast_channel *c, struct varshead ast_log(LOG_ERROR, "Unable to allocate bogus channel for variable substitution. Function results may be blank.\n"); } } - ast_debug(2, "Function result is '%s'\n", cp4 ? cp4 : "(null)"); + ast_debug(2, "Function %s result is '%s'\n", vars, cp4 ? cp4 : "(null)"); } else { /* Retrieve variable value */ pbx_retrieve_variable(c, vars, &cp4, workspace, VAR_BUF_SIZE, headp); diff --git a/main/translate.c b/main/translate.c index 5037b4283a084c70ffa0cdc0b006144dbbe4dfc5..96019f1c7d991fd1ab24258516ebf8bba8a04b4f 100644 --- a/main/translate.c +++ b/main/translate.c @@ -771,7 +771,7 @@ static void matrix_rebuild(int samples) matrix_get(x, z)->table_cost = newtablecost; matrix_get(x, z)->multistep = 1; changed++; - ast_debug(3, "Discovered %d cost path from %s to %s, via %s\n", + ast_debug(10, "Discovered %d cost path from %s to %s, via %s\n", matrix_get(x, z)->table_cost, ast_getformatname(ast_format_set(&tmpx, index2format(x), 0)), ast_getformatname(ast_format_set(&tmpy, index2format(z), 0)), diff --git a/main/xmldoc.c b/main/xmldoc.c index 80e7830aed2fd638fb24969b511ffae8d5080ecc..8a54d6f120c317b570f1296b0feb89f5ecb314bc 100644 --- a/main/xmldoc.c +++ b/main/xmldoc.c @@ -2186,7 +2186,6 @@ static char *_xmldoc_build_field(struct ast_xml_node *node, const char *var, int node = ast_xml_find_element(ast_xml_node_get_children(node), var, NULL, NULL); if (!node || !ast_xml_node_get_children(node)) { - ast_debug(1, "Cannot find variable '%s' in tree\n", var); return ret; }