diff options
| author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-10 14:45:25 +0000 |
|---|---|---|
| committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-10 14:45:25 +0000 |
| commit | 842faddb76b6fbcbd623292bf1656d76eb22f3a7 (patch) | |
| tree | 9d240f929d1efd30035a0505db16ba0f8e1ca439 /apps/app_adsiprog.c | |
| parent | 1013afa1ad09d854207d24d3aed691321fecc100 (diff) | |
More RSW merges. Everything from apps/ except for the big offenders
app_voicemail and app_queue.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@137055 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_adsiprog.c')
| -rw-r--r-- | apps/app_adsiprog.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c index 63be6bf06..8ee3a0410 100644 --- a/apps/app_adsiprog.c +++ b/apps/app_adsiprog.c @@ -776,7 +776,7 @@ static int digitcollect(char *buf, char *name, int id, char *args, struct adsi_s static int subscript(char *buf, char *name, int id, char *args, struct adsi_script *state, char *script, int lineno) { char *tok = get_token(&args, script, lineno); - char subscript[80]; + char subscr[80]; struct adsi_subscript *sub; if (!tok) { @@ -784,12 +784,12 @@ static int subscript(char *buf, char *name, int id, char *args, struct adsi_scri return 0; } - if (process_token(subscript, tok, sizeof(subscript) - 1, ARG_STRING)) { + if (process_token(subscr, tok, sizeof(subscr) - 1, ARG_STRING)) { ast_log(LOG_WARNING, "Invalid number of seconds '%s' at line %d of %s\n", tok, lineno, script); return 0; } - if (!(sub = getsubbyname(state, subscript, script, lineno))) + if (!(sub = getsubbyname(state, subscr, script, lineno))) return 0; buf[0] = 0x9d; @@ -801,7 +801,7 @@ static int subscript(char *buf, char *name, int id, char *args, struct adsi_scri static int onevent(char *buf, char *name, int id, char *args, struct adsi_script *state, char *script, int lineno) { char *tok = get_token(&args, script, lineno); - char subscript[80], sname[80]; + char subscr[80], sname[80]; int sawin = 0, event, snums[8], scnt = 0, x; struct adsi_subscript *sub; @@ -848,11 +848,11 @@ static int onevent(char *buf, char *name, int id, char *args, struct adsi_script ast_log(LOG_WARNING, "Missing subscript to call at line %d of %s\n", lineno, script); return 0; } - if (process_token(subscript, tok, sizeof(subscript) - 1, ARG_STRING)) { + if (process_token(subscr, tok, sizeof(subscr) - 1, ARG_STRING)) { ast_log(LOG_WARNING, "Invalid subscript '%s' at line %d of %s\n", tok, lineno, script); return 0; } - if (!(sub = getsubbyname(state, subscript, script, lineno))) + if (!(sub = getsubbyname(state, subscr, script, lineno))) return 0; buf[0] = 8; buf[1] = event; |