kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-02 03:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bug 5858 - Make the chanvars.c functions return a 'const char *'

Browse Source 
This should prevent us from unintentionally changing variable
values when they're returned from pbx_builtin_getvar_helper.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7304 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2005-12-03 19:25:33 +00:00
parent 6a6b88c0e3
commit 870f98f02d
27 changed files with 117 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
chanvars.c
View File

@@ -59,31 +59,27 @@ void ast_var_delete(struct ast_var_t *var)
free(var);
}
char *ast_var_name(struct ast_var_t *var)
const char *ast_var_name(const struct ast_var_t *var)
{
char *name;
const char *name;
if (var == NULL)
return NULL;
if (var->name == NULL)
if (var == NULL || (name = var->name) == NULL)
return NULL;
/* Return the name without the initial underscores */
if (var->name[0] == '_') {
if (var->name[1] == '_')
name = (char*)&(var->name[2]);
else
name = (char*)&(var->name[1]);
} else
name = var->name;
if (name[0] == '_') {
name++;
if (name[0] == '_')
name++;
}
return name;
}
char *ast_var_full_name(struct ast_var_t *var)
const char *ast_var_full_name(const struct ast_var_t *var)
{
return (var ? var->name : NULL);
}
char *ast_var_value(struct ast_var_t *var)
const char *ast_var_value(const struct ast_var_t *var)
{
return (var ? var->value : NULL);
}