diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-12-26 16:48:12 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-12-26 16:48:12 +0000 |
commit | b759554372b15d07ea48224bca996e3245b30e0d (patch) | |
tree | e4585c9edc45de0b8c9155b984c44517e86c1533 /pbx.c | |
parent | 6eb2c2ee1b09daf1e0a9c4afa1b874a7598cf323 (diff) |
Bug 6057 - Deprecate builtins that have been replaced by functions
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7633 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'pbx.c')
-rw-r--r-- | pbx.c | 17 |
1 files changed, 16 insertions, 1 deletions
@@ -903,6 +903,7 @@ void pbx_retrieve_variable(struct ast_channel *c, const char *var, char **ret, c struct tm brokentime; int offset, offset2, isfunc; struct ast_var_t *variables; + char *deprecated = NULL; if (c) headp=&c->varshead; @@ -929,6 +930,7 @@ void pbx_retrieve_variable(struct ast_channel *c, const char *var, char **ret, c *ret = workspace; } else *ret = NULL; + deprecated = "CALLERID(all)"; } else if (!strcmp(var + 8, "NUM")) { /* CALLERIDNUM */ if (c->cid.cid_num) { @@ -936,6 +938,7 @@ void pbx_retrieve_variable(struct ast_channel *c, const char *var, char **ret, c *ret = workspace; } else *ret = NULL; + deprecated = "CALLERID(num)"; } else if (!strcmp(var + 8, "NAME")) { /* CALLERIDNAME */ if (c->cid.cid_name) { @@ -943,7 +946,9 @@ void pbx_retrieve_variable(struct ast_channel *c, const char *var, char **ret, c *ret = workspace; } else *ret = NULL; - } + deprecated = "CALLERID(name)"; + } else + goto icky; } else if (!strcmp(var + 6, "ANI")) { /* CALLERANI */ if (c->cid.cid_ani) { @@ -951,6 +956,7 @@ void pbx_retrieve_variable(struct ast_channel *c, const char *var, char **ret, c *ret = workspace; } else *ret = NULL; + deprecated = "CALLERID(ANI)"; } else goto icky; } else if (!strncmp(var + 4, "ING", 3)) { @@ -980,6 +986,7 @@ void pbx_retrieve_variable(struct ast_channel *c, const char *var, char **ret, c *ret = workspace; } else *ret = NULL; + deprecated = "CALLERID(DNID)"; } else if (c && !strcmp(var, "HINT")) { if (!ast_get_hint(workspace, workspacelen, NULL, 0, c, c->context, c->exten)) *ret = NULL; @@ -999,6 +1006,7 @@ void pbx_retrieve_variable(struct ast_channel *c, const char *var, char **ret, c *ret = workspace; } else *ret = NULL; + deprecated = "CALLERID(RDNIS)"; } else if (c && !strcmp(var, "CONTEXT")) { ast_copy_string(workspace, c->context, workspacelen); *ret = workspace; @@ -1023,6 +1031,7 @@ void pbx_retrieve_variable(struct ast_channel *c, const char *var, char **ret, c brokentime.tm_sec ); *ret = workspace; + deprecated = "STRFTIME(${EPOCH},,\%m\%d\%Y-\%H:\%M:\%S)"; } else if (!strcmp(var, "TIMESTAMP")) { thistime=time(NULL); localtime_r(&thistime, &brokentime); @@ -1036,6 +1045,7 @@ void pbx_retrieve_variable(struct ast_channel *c, const char *var, char **ret, c brokentime.tm_sec ); *ret = workspace; + deprecated = "STRFTIME(${EPOCH},,\%Y\%m\%d-\%H\%M\%S)"; } else if (c && !strcmp(var, "UNIQUEID")) { snprintf(workspace, workspacelen, "%s", c->uniqueid); *ret = workspace; @@ -1045,9 +1055,11 @@ void pbx_retrieve_variable(struct ast_channel *c, const char *var, char **ret, c } else if (c && !strcmp(var, "ACCOUNTCODE")) { ast_copy_string(workspace, c->accountcode, workspacelen); *ret = workspace; + deprecated = "CDR(accountcode)"; } else if (c && !strcmp(var, "LANGUAGE")) { ast_copy_string(workspace, c->language, workspacelen); *ret = workspace; + deprecated = "LANGUAGE()"; } else { icky: if (headp) { @@ -1081,6 +1093,9 @@ icky: } } } + if (deprecated) { + ast_log(LOG_WARNING, "${%s} is deprecated. Please use ${%s} instead.\n", var, deprecated); + } } /*! \brief CLI function to show installed custom functions |