diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-10-19 18:19:02 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-10-19 18:19:02 +0000 |
commit | 58818426d60d583c4becc6a99b398cbac1b7b12f (patch) | |
tree | 5fee3540f8d72d45cd1b2e5bf15e5860581dd4f8 /apps/app_setrdnis.c | |
parent | a4d6ea67a7536e2cb2337527357ce6d3db8639f3 (diff) |
Massive cleanups to applications for LOCAL_USER handling and some other things.
In general, LOCAL_USER_ADD/REMOVE should be the first/last thing called in an
application. An exception is if there is some *fast* setup code that might
halt the execution of the application, such as checking to see if an argument
exists.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6832 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_setrdnis.c')
-rwxr-xr-x | apps/app_setrdnis.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/apps/app_setrdnis.c b/apps/app_setrdnis.c index c0f155f20..faff3efb5 100755 --- a/apps/app_setrdnis.c +++ b/apps/app_setrdnis.c @@ -61,22 +61,25 @@ static int setrdnis_exec(struct ast_channel *chan, void *data) { struct localuser *u; char *opt, *n, *l; - char tmp[256]; + char *tmp = NULL; static int deprecation_warning = 0; + LOCAL_USER_ADD(u); + if (!deprecation_warning) { ast_log(LOG_WARNING, "SetRDNIS is deprecated, please use Set(CALLERID(rdnis)=value) instead.\n"); deprecation_warning = 1; } if (data) - ast_copy_string(tmp, (char *)data, sizeof(tmp)); + tmp = ast_strdupa(data); else - tmp[0] = '\0'; + tmp = ""; + opt = strchr(tmp, '|'); if (opt) *opt = '\0'; - LOCAL_USER_ADD(u); + n = l = NULL; ast_callerid_parse(tmp, &n, &l); if (l) { @@ -87,7 +90,9 @@ static int setrdnis_exec(struct ast_channel *chan, void *data) chan->cid.cid_rdnis = (l[0]) ? strdup(l) : NULL; ast_mutex_unlock(&chan->lock); } + LOCAL_USER_REMOVE(u); + return 0; } |