kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 04:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the retrieval of the new SYSTEMNAME variable. Also, clarify some

Browse Source 
documentation of how pbx_retrieve_variable works. (issue #6493)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@10209 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2006-02-15 18:39:52 +00:00
parent 3d394586da
commit 5c95b9955c
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pbx.c
View File

@@ -909,13 +909,18 @@ void pbx_retrieve_variable(struct ast_channel *c, const char *var, char **ret, c
/* /*
* Look first into predefined variables, then into variable lists. * Look first into predefined variables, then into variable lists.
* Variable 's' points to the result, according to the following rules:
* s == &not_found (set at the beginning) means that we did not find a * s == &not_found (set at the beginning) means that we did not find a
* matching variable and need to look into more places. * matching variable and need to look into more places.
* If s != &not_found, s is a valid result string as follows: * If s != &not_found, s is a valid result string as follows:
* s = NULL if the variable does not have a value; * s = NULL if the variable does not have a value;
* you typically do this when looking for an unset predefined variable.
* s = workspace if the result has been assembled there; * s = workspace if the result has been assembled there;
* typically done when the result is built e.g. with an snprintf(),
* so we don't need to do an additional copy.
* s != workspace in case we have a string, that needs to be copied * s != workspace in case we have a string, that needs to be copied
* (the ast_copy_string is done once for all at the end). * (the ast_copy_string is done once for all at the end).
* Typically done when the result is already available in some string.
*/ */
s = &not_found; /* default value */ s = &not_found; /* default value */
if (c) { /* This group requires a valid channel */ if (c) { /* This group requires a valid channel */
@@ -961,7 +966,7 @@ void pbx_retrieve_variable(struct ast_channel *c, const char *var, char **ret, c
snprintf(workspace, workspacelen, "%u",(int)time(NULL)); snprintf(workspace, workspacelen, "%u",(int)time(NULL));
s = workspace; s = workspace;
} else if (!strcmp(var, "SYSTEMNAME")) { } else if (!strcmp(var, "SYSTEMNAME")) {
ast_copy_string(workspace, ast_config_AST_SYSTEM_NAME, workspacelen); s = ast_config_AST_SYSTEM_NAME;
} }
} }
/* if not found, look into chanvars or global vars */ /* if not found, look into chanvars or global vars */