kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-29 18:19:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Whitespace changes only

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37339 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2006-07-10 17:42:12 +00:00
parent 0e0059c0f3
commit 4a3e227291
1 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
app.c
View File

@@ -65,12 +65,12 @@ int ast_app_dtget(struct ast_channel *chan, const char *context, char *collect,
struct tone_zone_sound *ts; struct tone_zone_sound *ts;
int res=0, x=0; int res=0, x=0;
if(maxlen > size) if (maxlen > size)
maxlen = size; maxlen = size;
if(!timeout && chan->pbx) if (!timeout && chan->pbx)
timeout = chan->pbx->dtimeout; timeout = chan->pbx->dtimeout;
else if(!timeout) else if (!timeout)
timeout = 5; timeout = 5;
ts = ast_get_indication_tone(chan->zone,"dial"); ts = ast_get_indication_tone(chan->zone,"dial");
@@ -99,8 +99,6 @@ int ast_app_dtget(struct ast_channel *chan, const char *context, char *collect,
return res; return res;
} }
/*! \param timeout set timeout to 0 for "standard" timeouts. Set timeout to -1 for /*! \param timeout set timeout to 0 for "standard" timeouts. Set timeout to -1 for
"ludicrous time" (essentially never times out) */ "ludicrous time" (essentially never times out) */
int ast_app_getdata(struct ast_channel *c, char *prompt, char *s, int maxlen, int timeout) int ast_app_getdata(struct ast_channel *c, char *prompt, char *s, int maxlen, int timeout)
@@ -128,7 +126,7 @@ int ast_app_getdata(struct ast_channel *c, char *prompt, char *s, int maxlen, in
int ast_app_getdata_full(struct ast_channel *c, char *prompt, char *s, int maxlen, int timeout, int audiofd, int ctrlfd) int ast_app_getdata_full(struct ast_channel *c, char *prompt, char *s, int maxlen, int timeout, int audiofd, int ctrlfd)
{ {
int res,to,fto; int res, to, fto;
if (prompt) { if (prompt) {
res = ast_streamfile(c, prompt, c->language); res = ast_streamfile(c, prompt, c->language);
if (res < 0) if (res < 0)
@@ -538,7 +536,7 @@ static int __ast_play_and_record(struct ast_channel *chan, const char *playfile,
stringp = fmts; stringp = fmts;
strsep(&stringp, "|"); strsep(&stringp, "|");
ast_log(LOG_DEBUG,"Recording Formats: sfmts=%s\n", fmts); ast_log(LOG_DEBUG, "Recording Formats: sfmts=%s\n", fmts);
sfmt[0] = ast_strdupa(fmts); sfmt[0] = ast_strdupa(fmts);
while ((fmt = strsep(&stringp, "|"))) { while ((fmt = strsep(&stringp, "|"))) {
@@ -555,9 +553,8 @@ static int __ast_play_and_record(struct ast_channel *chan, const char *playfile,
if (option_verbose > 2) if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "x=%d, open writing: %s format: %s, %p\n", x, prepend ? prependfile : recordfile, sfmt[x], others[x]); ast_verbose(VERBOSE_PREFIX_3 "x=%d, open writing: %s format: %s, %p\n", x, prepend ? prependfile : recordfile, sfmt[x], others[x]);
if (!others[x]) { if (!others[x])
break; break;
}
} }
if (path) if (path)
@@ -705,7 +702,7 @@ static int __ast_play_and_record(struct ast_channel *chan, const char *playfile,
if (!others[x]) if (!others[x])
break; break;
if (res > 0) if (res > 0)
ast_stream_rewind(others[x], totalsilence ? totalsilence-200 : 200); ast_stream_rewind(others[x], totalsilence ? totalsilence - 200 : 200);
ast_truncstream(others[x]); ast_truncstream(others[x]);
ast_closestream(others[x]); ast_closestream(others[x]);
} }
@@ -720,7 +717,7 @@ static int __ast_play_and_record(struct ast_channel *chan, const char *playfile,
realfiles[x] = ast_readfile(recordfile, sfmt[x], comment, O_RDONLY, 0, 0); realfiles[x] = ast_readfile(recordfile, sfmt[x], comment, O_RDONLY, 0, 0);
if (!others[x] || !realfiles[x]) if (!others[x] || !realfiles[x])
break; break;
ast_stream_rewind(others[x], totalsilence ? totalsilence-200 : 200); ast_stream_rewind(others[x], totalsilence ? totalsilence - 200 : 200);
ast_truncstream(others[x]); ast_truncstream(others[x]);
/* add the original file too */ /* add the original file too */
while ((fr = ast_readframe(realfiles[x]))) { while ((fr = ast_readframe(realfiles[x]))) {
@@ -925,7 +922,7 @@ enum AST_LOCK_RESULT ast_lock_path(const char *path)
snprintf(fs, strlen(path) + 19, "%s/.lock-%08lx", path, ast_random()); snprintf(fs, strlen(path) + 19, "%s/.lock-%08lx", path, ast_random());
fd = open(fs, O_WRONLY | O_CREAT | O_EXCL, 0600); fd = open(fs, O_WRONLY | O_CREAT | O_EXCL, 0600);
if (fd < 0) { if (fd < 0) {
fprintf(stderr, "Unable to create lock file '%s': %s\n", path, strerror(errno)); ast_log(LOG_ERROR, "Unable to create lock file '%s': %s\n", path, strerror(errno));
return AST_LOCK_PATH_NOT_FOUND; return AST_LOCK_PATH_NOT_FOUND;
} }
close(fd); close(fd);
@@ -1056,6 +1053,7 @@ int ast_record_review(struct ast_channel *chan, const char *playfile, const char
#define RES_RESTART ((1 << 19) | RES_REPEAT) #define RES_RESTART ((1 << 19) | RES_REPEAT)
static int ast_ivr_menu_run_internal(struct ast_channel *chan, struct ast_ivr_menu *menu, void *cbdata); static int ast_ivr_menu_run_internal(struct ast_channel *chan, struct ast_ivr_menu *menu, void *cbdata);
static int ivr_dispatch(struct ast_channel *chan, struct ast_ivr_option *option, char *exten, void *cbdata) static int ivr_dispatch(struct ast_channel *chan, struct ast_ivr_option *option, char *exten, void *cbdata)
{ {
int res; int res;
@@ -1127,7 +1125,7 @@ static int ivr_dispatch(struct ast_channel *chan, struct ast_ivr_option *option,
static int option_exists(struct ast_ivr_menu *menu, char *option) static int option_exists(struct ast_ivr_menu *menu, char *option)
{ {
int x; int x;
for (x=0;menu->options[x].option;x++) for (x = 0; menu->options[x].option; x++)
if (!strcasecmp(menu->options[x].option, option)) if (!strcasecmp(menu->options[x].option, option))
return x; return x;
return -1; return -1;
@@ -1136,7 +1134,7 @@ static int option_exists(struct ast_ivr_menu *menu, char *option)
static int option_matchmore(struct ast_ivr_menu *menu, char *option) static int option_matchmore(struct ast_ivr_menu *menu, char *option)
{ {
int x; int x;
for (x=0;menu->options[x].option;x++) for (x = 0; menu->options[x].option; x++)
if ((!strncasecmp(menu->options[x].option, option, strlen(option))) && if ((!strncasecmp(menu->options[x].option, option, strlen(option))) &&
(menu->options[x].option[strlen(option)])) (menu->options[x].option[strlen(option)]))
return x; return x;
@@ -1147,7 +1145,7 @@ static int read_newoption(struct ast_channel *chan, struct ast_ivr_menu *menu, c
{ {
int res=0; int res=0;
int ms; int ms;
while(option_matchmore(menu, exten)) { while (option_matchmore(menu, exten)) {
ms = chan->pbx ? chan->pbx->dtimeout : 5000; ms = chan->pbx ? chan->pbx->dtimeout : 5000;
if (strlen(exten) >= maxexten - 1) if (strlen(exten) >= maxexten - 1)
break; break;
@@ -1202,7 +1200,7 @@ static int ast_ivr_menu_run_internal(struct ast_channel *chan, struct ast_ivr_me
else if (option_exists(menu, "s") > -1) else if (option_exists(menu, "s") > -1)
strcpy(exten, "s"); strcpy(exten, "s");
} }
pos=0; pos = 0;
continue; continue;
} else if (res && strchr(AST_DIGIT_ANY, res)) { } else if (res && strchr(AST_DIGIT_ANY, res)) {
ast_log(LOG_DEBUG, "Got start of extension, %c\n", res); ast_log(LOG_DEBUG, "Got start of extension, %c\n", res);
@@ -1242,26 +1240,23 @@ static int ast_ivr_menu_run_internal(struct ast_channel *chan, struct ast_ivr_me
int ast_ivr_menu_run(struct ast_channel *chan, struct ast_ivr_menu *menu, void *cbdata) int ast_ivr_menu_run(struct ast_channel *chan, struct ast_ivr_menu *menu, void *cbdata)
{ {
int res; int res = ast_ivr_menu_run_internal(chan, menu, cbdata);
res = ast_ivr_menu_run_internal(chan, menu, cbdata);
/* Hide internal coding */ /* Hide internal coding */
if (res > 0) return res > 0 ? 0 : res;
res = 0;
return res;
} }
char *ast_read_textfile(const char *filename) char *ast_read_textfile(const char *filename)
{ {
int fd; int fd;
char *output=NULL; char *output = NULL;
struct stat filesize; struct stat filesize;
int count=0; int count = 0;
int res; int res;
if(stat(filename,&filesize)== -1){ if (stat(filename, &filesize) == -1) {
ast_log(LOG_WARNING,"Error can't stat %s\n", filename); ast_log(LOG_WARNING, "Error can't stat %s\n", filename);
return NULL; return NULL;
} }
count=filesize.st_size + 1; count = filesize.st_size + 1;
fd = open(filename, O_RDONLY); fd = open(filename, O_RDONLY);
if (fd < 0) { if (fd < 0) {
ast_log(LOG_WARNING, "Cannot open file '%s' for reading: %s\n", filename, strerror(errno)); ast_log(LOG_WARNING, "Cannot open file '%s' for reading: %s\n", filename, strerror(errno));
@@ -1272,7 +1267,7 @@ char *ast_read_textfile(const char *filename)
if (res == count - 1) { if (res == count - 1) {
output[res] = '\0'; output[res] = '\0';
} else { } else {
ast_log(LOG_WARNING, "Short read of %s (%d of %d): %s\n", filename, res, count - 1, strerror(errno)); ast_log(LOG_WARNING, "Short read of %s (%d of %d): %s\n", filename, res, count - 1, strerror(errno));
free(output); free(output);
output = NULL; output = NULL;
} }
@@ -1318,3 +1313,4 @@ int ast_app_parse_options(const struct ast_app_option *options, struct ast_flags
return res; return res;
} }